gcc - mrrl - Minimal Reliable Reproducible Linux

commit 88212f651dd15773beca1180c0b5b7e2cd388465
parent b2ac00e138d77fd593b86d2f14762e464a959cfc
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Fri,  5 Dec 2025 02:40:41 +0000

gcc

Diffstat:
A templates/.swl  | 0 
M templates/package_sets  | 4 ++--
M templates/pkg/gcc  | 4 ++++
M variants/ccx-x86_64/aat  | 60 ++++++++++++++++++++++++++++++------------------------------
M variants/ccx-x86_64/abduco  | 64 +++++++++++++++++++++++++++++++---------------------------------
M variants/ccx-x86_64/alpine-keys  | 56 ++++++++++++++++++++++++++++----------------------------
M variants/ccx-x86_64/apk-tools  | 72 +++++++++++++++++++++++++++++++++++-------------------------------------
M variants/ccx-x86_64/applyuidgid-caps  | 64 +++++++++++++++++++++++++++++++---------------------------------
M variants/ccx-x86_64/argp-standalone  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/ccx-x86_64/attr  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/ccx-x86_64/bison  | 68 +++++++++++++++++++++++++++++++++-----------------------------------
M variants/ccx-x86_64/busybox  | 4 +---
M variants/ccx-x86_64/busybox-ash  | 2 +-
M variants/ccx-x86_64/busybox-attr  | 2 +-
M variants/ccx-x86_64/busybox-awk  | 2 +-
M variants/ccx-x86_64/busybox-bc  | 2 +-
M variants/ccx-x86_64/busybox-bzip2  | 2 +-
M variants/ccx-x86_64/busybox-chpst  | 2 +-
M variants/ccx-x86_64/busybox-console  | 2 +-
M variants/ccx-x86_64/busybox-coreutils  | 2 +-
M variants/ccx-x86_64/busybox-coreutils-extra  | 2 +-
M variants/ccx-x86_64/busybox-cpio  | 2 +-
M variants/ccx-x86_64/busybox-cron  | 2 +-
M variants/ccx-x86_64/busybox-daemontools  | 2 +-
M variants/ccx-x86_64/busybox-diffutils  | 2 +-
M variants/ccx-x86_64/busybox-dosfstools  | 2 +-
M variants/ccx-x86_64/busybox-dpkg  | 2 +-
M variants/ccx-x86_64/busybox-e2fsprogs  | 2 +-
M variants/ccx-x86_64/busybox-ed  | 2 +-
M variants/ccx-x86_64/busybox-findutils  | 2 +-
M variants/ccx-x86_64/busybox-getty  | 2 +-
M variants/ccx-x86_64/busybox-grep  | 2 +-
M variants/ccx-x86_64/busybox-gzip  | 2 +-
M variants/ccx-x86_64/busybox-i2c-tools  | 2 +-
M variants/ccx-x86_64/busybox-iproute2  | 2 +-
M variants/ccx-x86_64/busybox-iputils  | 2 +-
M variants/ccx-x86_64/busybox-kbd  | 2 +-
M variants/ccx-x86_64/busybox-linux-extra  | 2 +-
M variants/ccx-x86_64/busybox-logging  | 2 +-
M variants/ccx-x86_64/busybox-login  | 2 +-
M variants/ccx-x86_64/busybox-lzop  | 2 +-
M variants/ccx-x86_64/busybox-misc  | 2 +-
M variants/ccx-x86_64/busybox-modutils  | 2 +-
M variants/ccx-x86_64/busybox-mtd-utils  | 2 +-
M variants/ccx-x86_64/busybox-net-misc  | 2 +-
M variants/ccx-x86_64/busybox-net-tools  | 2 +-
M variants/ccx-x86_64/busybox-process-extra  | 2 +-
M variants/ccx-x86_64/busybox-procps  | 2 +-
M variants/ccx-x86_64/busybox-psmisc  | 2 +-
M variants/ccx-x86_64/busybox-rpm  | 2 +-
M variants/ccx-x86_64/busybox-sed  | 2 +-
M variants/ccx-x86_64/busybox-sh  | 2 +-
M variants/ccx-x86_64/busybox-shadow  | 2 +-
M variants/ccx-x86_64/busybox-su  | 2 +-
M variants/ccx-x86_64/busybox-tar  | 2 +-
M variants/ccx-x86_64/busybox-traceroute  | 2 +-
M variants/ccx-x86_64/busybox-unzip  | 2 +-
M variants/ccx-x86_64/busybox-util-linux-priv  | 2 +-
M variants/ccx-x86_64/busybox-util-linux-unpriv  | 2 +-
M variants/ccx-x86_64/busybox-vi  | 2 +-
M variants/ccx-x86_64/busybox-wget  | 2 +-
M variants/ccx-x86_64/busybox-xxd  | 2 +-
M variants/ccx-x86_64/busybox-xz  | 2 +-
M variants/ccx-x86_64/busybox:modutils  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/ccx-x86_64/ca-certificates-wip-donotuse  | 58 +++++++++++++++++++++++++++++-----------------------------
M variants/ccx-x86_64/ccx-utils  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/ccx-x86_64/certdata2pem  | 60 +++++++++++++++++++++++++++++-------------------------------
M variants/ccx-x86_64/confz  | 60 ++++++++++++++++++++++++++++++------------------------------
M variants/ccx-x86_64/container-bin-image  | 112 ++++++++++++++++++++++++++++++++++++++++----------------------------------------
M variants/ccx-x86_64/containers  | 84 ++++++++++++++++++++++++++++++++++++++++----------------------------------------
M variants/ccx-x86_64/containers.environment  | 128 ++++++++++++++++++++++++++++++++++++++++----------------------------------------
M variants/ccx-x86_64/curl  | 68 +++++++++++++++++++++++++++++++++-----------------------------------
M variants/ccx-x86_64/default.environment  | 196 +++++++++++++++++++++++++++++++++++++++----------------------------------------
M variants/ccx-x86_64/diffutils  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/ccx-x86_64/dune  | 64 +++++++++++++++++++++++++++++++---------------------------------
M variants/ccx-x86_64/easyseccomp  | 78 ++++++++++++++++++++++++++++++++++++++----------------------------------------
M variants/ccx-x86_64/error-standalone  | 64 +++++++++++++++++++++++++++++++---------------------------------
M variants/ccx-x86_64/execline  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/ccx-x86_64/fileset  | 60 ++++++++++++++++++++++++++++++------------------------------
M variants/ccx-x86_64/findutils  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/ccx-x86_64/flex  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/ccx-x86_64/gcc  | 4 ++++
M variants/ccx-x86_64/getconf  | 60 +++++++++++++++++++++++++++++-------------------------------
M variants/ccx-x86_64/getent  | 60 +++++++++++++++++++++++++++++-------------------------------
M variants/ccx-x86_64/git  | 70 ++++++++++++++++++++++++++++++++++------------------------------------
M variants/ccx-x86_64/gnu-make  | 4 +---
M variants/ccx-x86_64/gperf  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/ccx-x86_64/iconv  | 60 +++++++++++++++++++++++++++++-------------------------------
M variants/ccx-x86_64/kbd  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/ccx-x86_64/kernel.environment  | 6 +++---
M variants/ccx-x86_64/libarchive  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/ccx-x86_64/libbsd  | 68 +++++++++++++++++++++++++++++++++-----------------------------------
M variants/ccx-x86_64/libcap  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/ccx-x86_64/libcgroup  | 72 +++++++++++++++++++++++++++++++++++-------------------------------------
M variants/ccx-x86_64/libelf  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/ccx-x86_64/libmd  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/ccx-x86_64/libressl  | 70 ++++++++++++++++++++++++++++++++++------------------------------------
M variants/ccx-x86_64/libseccomp  | 70 ++++++++++++++++++++++++++++++++++------------------------------------
M variants/ccx-x86_64/libunwind  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/ccx-x86_64/linux  | 80 +++++++++++++++++++++++++++++++++++++++----------------------------------------
M variants/ccx-x86_64/linux-qemu-guest  | 80 +++++++++++++++++++++++++++++++++++++++----------------------------------------
M variants/ccx-x86_64/logincaps  | 68 +++++++++++++++++++++++++++++++++-----------------------------------
M variants/ccx-x86_64/m4  | 64 +++++++++++++++++++++++++++++++---------------------------------
M variants/ccx-x86_64/mandoc  | 64 +++++++++++++++++++++++++++++++---------------------------------
M variants/ccx-x86_64/mdev-scripts  | 60 ++++++++++++++++++++++++++++++------------------------------
M variants/ccx-x86_64/mdevd  | 68 +++++++++++++++++++++++++++++++++-----------------------------------
M variants/ccx-x86_64/mdevd.environment  | 102 ++++++++++++++++++++++++++++++++++++++++----------------------------------------
M variants/ccx-x86_64/mlog  | 62 ++++++++++++++++++++++++++++++--------------------------------
M variants/ccx-x86_64/musl-fts  | 62 ++++++++++++++++++++++++++++++--------------------------------
M variants/ccx-x86_64/nawk  | 64 +++++++++++++++++++++++++++++++---------------------------------
M variants/ccx-x86_64/netbsd-curses  | 62 ++++++++++++++++++++++++++++++--------------------------------
M variants/ccx-x86_64/nvi  | 68 +++++++++++++++++++++++++++++++++-----------------------------------
M variants/ccx-x86_64/ocaml-astring  | 72 +++++++++++++++++++++++++++++++++++-------------------------------------
M variants/ccx-x86_64/ocaml-base  | 70 ++++++++++++++++++++++++++++++++++------------------------------------
M variants/ccx-x86_64/ocaml-bos  | 84 +++++++++++++++++++++++++++++++++++++++----------------------------------------
M variants/ccx-x86_64/ocaml-cmdliner  | 72 +++++++++++++++++++++++++++++++++++-------------------------------------
M variants/ccx-x86_64/ocaml-compiler-libs  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/ccx-x86_64/ocaml-cppo  | 68 +++++++++++++++++++++++++++++++++-----------------------------------
M variants/ccx-x86_64/ocaml-findlib  | 74 ++++++++++++++++++++++++++++++++++++--------------------------------------
M variants/ccx-x86_64/ocaml-fmt  | 74 ++++++++++++++++++++++++++++++++++++--------------------------------------
M variants/ccx-x86_64/ocaml-fpath  | 74 ++++++++++++++++++++++++++++++++++++--------------------------------------
M variants/ccx-x86_64/ocaml-logs  | 78 ++++++++++++++++++++++++++++++++++++++----------------------------------------
M variants/ccx-x86_64/ocaml-lun  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/ccx-x86_64/ocaml-mtime  | 72 +++++++++++++++++++++++++++++++++++-------------------------------------
M variants/ccx-x86_64/ocaml-ppx_derivers  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/ccx-x86_64/ocaml-ppx_deriving  | 80 +++++++++++++++++++++++++++++++++++++++----------------------------------------
M variants/ccx-x86_64/ocaml-ppxlib  | 74 ++++++++++++++++++++++++++++++++++++--------------------------------------
M variants/ccx-x86_64/ocaml-rresult  | 72 +++++++++++++++++++++++++++++++++++-------------------------------------
M variants/ccx-x86_64/ocaml-sexplib0  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/ccx-x86_64/ocaml-stdlib-shims  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/ccx-x86_64/ocaml-topkg  | 70 ++++++++++++++++++++++++++++++++++------------------------------------
M variants/ccx-x86_64/ocaml.environment  | 18 +++++++++---------
M variants/ccx-x86_64/ocaml:dynlink  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/ccx-x86_64/ocaml_intrinsics_kernel  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/ccx-x86_64/ocamlbuild  | 70 ++++++++++++++++++++++++++++++++++------------------------------------
M variants/ccx-x86_64/opam  | 74 ++++++++++++++++++++++++++++++++++++--------------------------------------
M variants/ccx-x86_64/patch  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/ccx-x86_64/pkgconf  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/ccx-x86_64/pkgconf-pkg-config  | 54 +++++++++++++++++++++++++++---------------------------
M variants/ccx-x86_64/popt  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/ccx-x86_64/pthbs-banginstall  | 58 +++++++++++++++++++++++++++++-----------------------------
M variants/ccx-x86_64/rsync  | 72 +++++++++++++++++++++++++++++++++++-------------------------------------
M variants/ccx-x86_64/s6  | 68 +++++++++++++++++++++++++++++++++-----------------------------------
M variants/ccx-x86_64/s6-dns  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/ccx-x86_64/s6-linux-init  | 70 ++++++++++++++++++++++++++++++++++------------------------------------
M variants/ccx-x86_64/s6-linux-utils  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/ccx-x86_64/s6-networking  | 74 ++++++++++++++++++++++++++++++++++++--------------------------------------
M variants/ccx-x86_64/s6-portable-utils  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/ccx-x86_64/s6-rc  | 70 ++++++++++++++++++++++++++++++++++------------------------------------
M variants/ccx-x86_64/skalibs  | 62 ++++++++++++++++++++++++++++++--------------------------------
M variants/ccx-x86_64/snaprep  | 60 ++++++++++++++++++++++++++++++------------------------------
M variants/ccx-x86_64/squashfs-tools  | 68 +++++++++++++++++++++++++++++++++-----------------------------------
M variants/ccx-x86_64/strace  | 70 ++++++++++++++++++++++++++++++++++------------------------------------
M variants/ccx-x86_64/system-config  | 130 ++++++++++++++++++++++++++++++++++++++++----------------------------------------
M variants/ccx-x86_64/system-config-init  | 108 ++++++++++++++++++++++++++++++++++++++++----------------------------------------
M variants/ccx-x86_64/system-config-rc  | 66 +++++++++++++++++++++++++++++++++---------------------------------
M variants/ccx-x86_64/system-config-scripts  | 60 ++++++++++++++++++++++++++++++------------------------------
M variants/ccx-x86_64/system-config-zsh  | 58 +++++++++++++++++++++++++++++-----------------------------
M variants/ccx-x86_64/tinyssh  | 64 +++++++++++++++++++++++++++++++---------------------------------
M variants/ccx-x86_64/user-env  | 60 ++++++++++++++++++++++++++++++------------------------------
M variants/ccx-x86_64/userspace.environment  | 184 +++++++++++++++++++++++++++++++++++++++----------------------------------------
M variants/ccx-x86_64/vm.environment  | 4 ++--
M variants/ccx-x86_64/xbps  | 68 +++++++++++++++++++++++++++++++++-----------------------------------
M variants/ccx-x86_64/zsh  | 70 ++++++++++++++++++++++++++++++++++------------------------------------
M variants/ccx-x86_64/zstd  | 64 +++++++++++++++++++++++++++++++---------------------------------
M variants/root-x86_64/aat  | 60 ++++++++++++++++++++++++++++++------------------------------
M variants/root-x86_64/abduco  | 64 +++++++++++++++++++++++++++++++---------------------------------
M variants/root-x86_64/alpine-keys  | 56 ++++++++++++++++++++++++++++----------------------------
M variants/root-x86_64/apk-tools  | 72 +++++++++++++++++++++++++++++++++++-------------------------------------
M variants/root-x86_64/applyuidgid-caps  | 64 +++++++++++++++++++++++++++++++---------------------------------
M variants/root-x86_64/argp-standalone  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/root-x86_64/attr  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/root-x86_64/bison  | 68 +++++++++++++++++++++++++++++++++-----------------------------------
M variants/root-x86_64/busybox  | 4 +---
M variants/root-x86_64/busybox-ash  | 2 +-
M variants/root-x86_64/busybox-attr  | 2 +-
M variants/root-x86_64/busybox-awk  | 2 +-
M variants/root-x86_64/busybox-bc  | 2 +-
M variants/root-x86_64/busybox-bzip2  | 2 +-
M variants/root-x86_64/busybox-chpst  | 2 +-
M variants/root-x86_64/busybox-console  | 2 +-
M variants/root-x86_64/busybox-coreutils  | 2 +-
M variants/root-x86_64/busybox-coreutils-extra  | 2 +-
M variants/root-x86_64/busybox-cpio  | 2 +-
M variants/root-x86_64/busybox-cron  | 2 +-
M variants/root-x86_64/busybox-daemontools  | 2 +-
M variants/root-x86_64/busybox-diffutils  | 2 +-
M variants/root-x86_64/busybox-dosfstools  | 2 +-
M variants/root-x86_64/busybox-dpkg  | 2 +-
M variants/root-x86_64/busybox-e2fsprogs  | 2 +-
M variants/root-x86_64/busybox-ed  | 2 +-
M variants/root-x86_64/busybox-findutils  | 2 +-
M variants/root-x86_64/busybox-getty  | 2 +-
M variants/root-x86_64/busybox-grep  | 2 +-
M variants/root-x86_64/busybox-gzip  | 2 +-
M variants/root-x86_64/busybox-i2c-tools  | 2 +-
M variants/root-x86_64/busybox-iproute2  | 2 +-
M variants/root-x86_64/busybox-iputils  | 2 +-
M variants/root-x86_64/busybox-kbd  | 2 +-
M variants/root-x86_64/busybox-linux-extra  | 2 +-
M variants/root-x86_64/busybox-logging  | 2 +-
M variants/root-x86_64/busybox-login  | 2 +-
M variants/root-x86_64/busybox-lzop  | 2 +-
M variants/root-x86_64/busybox-misc  | 2 +-
M variants/root-x86_64/busybox-modutils  | 2 +-
M variants/root-x86_64/busybox-mtd-utils  | 2 +-
M variants/root-x86_64/busybox-net-misc  | 2 +-
M variants/root-x86_64/busybox-net-tools  | 2 +-
M variants/root-x86_64/busybox-process-extra  | 2 +-
M variants/root-x86_64/busybox-procps  | 2 +-
M variants/root-x86_64/busybox-psmisc  | 2 +-
M variants/root-x86_64/busybox-rpm  | 2 +-
M variants/root-x86_64/busybox-sed  | 2 +-
M variants/root-x86_64/busybox-sh  | 2 +-
M variants/root-x86_64/busybox-shadow  | 2 +-
M variants/root-x86_64/busybox-su  | 2 +-
M variants/root-x86_64/busybox-tar  | 2 +-
M variants/root-x86_64/busybox-traceroute  | 2 +-
M variants/root-x86_64/busybox-unzip  | 2 +-
M variants/root-x86_64/busybox-util-linux-priv  | 2 +-
M variants/root-x86_64/busybox-util-linux-unpriv  | 2 +-
M variants/root-x86_64/busybox-vi  | 2 +-
M variants/root-x86_64/busybox-wget  | 2 +-
M variants/root-x86_64/busybox-xxd  | 2 +-
M variants/root-x86_64/busybox-xz  | 2 +-
M variants/root-x86_64/ca-certificates-wip-donotuse  | 58 +++++++++++++++++++++++++++++-----------------------------
M variants/root-x86_64/ccx-utils  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/root-x86_64/certdata2pem  | 60 +++++++++++++++++++++++++++++-------------------------------
M variants/root-x86_64/confz  | 60 ++++++++++++++++++++++++++++++------------------------------
M variants/root-x86_64/container-bin-image  | 112 ++++++++++++++++++++++++++++++++++++++++----------------------------------------
M variants/root-x86_64/containers  | 84 ++++++++++++++++++++++++++++++++++++++++----------------------------------------
M variants/root-x86_64/containers.environment  | 128 ++++++++++++++++++++++++++++++++++++++++----------------------------------------
M variants/root-x86_64/curl  | 68 +++++++++++++++++++++++++++++++++-----------------------------------
M variants/root-x86_64/default.environment  | 196 +++++++++++++++++++++++++++++++++++++++----------------------------------------
M variants/root-x86_64/diffutils  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/root-x86_64/dune  | 64 +++++++++++++++++++++++++++++++---------------------------------
M variants/root-x86_64/easyseccomp  | 78 ++++++++++++++++++++++++++++++++++++++----------------------------------------
M variants/root-x86_64/error-standalone  | 64 +++++++++++++++++++++++++++++++---------------------------------
M variants/root-x86_64/execline  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/root-x86_64/fileset  | 60 ++++++++++++++++++++++++++++++------------------------------
M variants/root-x86_64/findutils  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/root-x86_64/flex  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/root-x86_64/gcc  | 4 ++++
M variants/root-x86_64/getconf  | 60 +++++++++++++++++++++++++++++-------------------------------
M variants/root-x86_64/getent  | 60 +++++++++++++++++++++++++++++-------------------------------
M variants/root-x86_64/git  | 70 ++++++++++++++++++++++++++++++++++------------------------------------
M variants/root-x86_64/gnu-make  | 4 +---
M variants/root-x86_64/gperf  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/root-x86_64/iconv  | 60 +++++++++++++++++++++++++++++-------------------------------
M variants/root-x86_64/kbd  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/root-x86_64/libarchive  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/root-x86_64/libbsd  | 68 +++++++++++++++++++++++++++++++++-----------------------------------
M variants/root-x86_64/libcap  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/root-x86_64/libcgroup  | 72 +++++++++++++++++++++++++++++++++++-------------------------------------
M variants/root-x86_64/libelf  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/root-x86_64/libmd  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/root-x86_64/libressl  | 70 ++++++++++++++++++++++++++++++++++------------------------------------
M variants/root-x86_64/libseccomp  | 70 ++++++++++++++++++++++++++++++++++------------------------------------
M variants/root-x86_64/libunwind  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/root-x86_64/linux-qemu-guest  | 80 +++++++++++++++++++++++++++++++++++++++----------------------------------------
M variants/root-x86_64/logincaps  | 68 +++++++++++++++++++++++++++++++++-----------------------------------
M variants/root-x86_64/m4  | 64 +++++++++++++++++++++++++++++++---------------------------------
M variants/root-x86_64/mandoc  | 64 +++++++++++++++++++++++++++++++---------------------------------
M variants/root-x86_64/mdev-scripts  | 60 ++++++++++++++++++++++++++++++------------------------------
M variants/root-x86_64/mdevd  | 68 +++++++++++++++++++++++++++++++++-----------------------------------
M variants/root-x86_64/mdevd.environment  | 102 ++++++++++++++++++++++++++++++++++++++++----------------------------------------
M variants/root-x86_64/mlog  | 62 ++++++++++++++++++++++++++++++--------------------------------
M variants/root-x86_64/musl-fts  | 62 ++++++++++++++++++++++++++++++--------------------------------
M variants/root-x86_64/nawk  | 64 +++++++++++++++++++++++++++++++---------------------------------
M variants/root-x86_64/netbsd-curses  | 62 ++++++++++++++++++++++++++++++--------------------------------
M variants/root-x86_64/nvi  | 68 +++++++++++++++++++++++++++++++++-----------------------------------
M variants/root-x86_64/ocaml-astring  | 72 +++++++++++++++++++++++++++++++++++-------------------------------------
M variants/root-x86_64/ocaml-base  | 70 ++++++++++++++++++++++++++++++++++------------------------------------
M variants/root-x86_64/ocaml-bos  | 84 +++++++++++++++++++++++++++++++++++++++----------------------------------------
M variants/root-x86_64/ocaml-cmdliner  | 72 +++++++++++++++++++++++++++++++++++-------------------------------------
M variants/root-x86_64/ocaml-compiler-libs  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/root-x86_64/ocaml-cppo  | 68 +++++++++++++++++++++++++++++++++-----------------------------------
M variants/root-x86_64/ocaml-findlib  | 74 ++++++++++++++++++++++++++++++++++++--------------------------------------
M variants/root-x86_64/ocaml-fmt  | 74 ++++++++++++++++++++++++++++++++++++--------------------------------------
M variants/root-x86_64/ocaml-fpath  | 74 ++++++++++++++++++++++++++++++++++++--------------------------------------
M variants/root-x86_64/ocaml-logs  | 78 ++++++++++++++++++++++++++++++++++++++----------------------------------------
M variants/root-x86_64/ocaml-lun  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/root-x86_64/ocaml-mtime  | 72 +++++++++++++++++++++++++++++++++++-------------------------------------
M variants/root-x86_64/ocaml-ppx_derivers  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/root-x86_64/ocaml-ppx_deriving  | 80 +++++++++++++++++++++++++++++++++++++++----------------------------------------
M variants/root-x86_64/ocaml-ppxlib  | 74 ++++++++++++++++++++++++++++++++++++--------------------------------------
M variants/root-x86_64/ocaml-rresult  | 72 +++++++++++++++++++++++++++++++++++-------------------------------------
M variants/root-x86_64/ocaml-sexplib0  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/root-x86_64/ocaml-stdlib-shims  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/root-x86_64/ocaml-topkg  | 70 ++++++++++++++++++++++++++++++++++------------------------------------
M variants/root-x86_64/ocaml.environment  | 18 +++++++++---------
M variants/root-x86_64/ocaml:dynlink  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/root-x86_64/ocaml_intrinsics_kernel  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/root-x86_64/ocamlbuild  | 70 ++++++++++++++++++++++++++++++++++------------------------------------
M variants/root-x86_64/opam  | 74 ++++++++++++++++++++++++++++++++++++--------------------------------------
M variants/root-x86_64/patch  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/root-x86_64/pkgconf  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/root-x86_64/pkgconf-pkg-config  | 54 +++++++++++++++++++++++++++---------------------------
M variants/root-x86_64/popt  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/root-x86_64/pthbs-banginstall  | 58 +++++++++++++++++++++++++++++-----------------------------
M variants/root-x86_64/rsync  | 72 +++++++++++++++++++++++++++++++++++-------------------------------------
M variants/root-x86_64/s6  | 68 +++++++++++++++++++++++++++++++++-----------------------------------
M variants/root-x86_64/s6-dns  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/root-x86_64/s6-linux-init  | 70 ++++++++++++++++++++++++++++++++++------------------------------------
M variants/root-x86_64/s6-linux-utils  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/root-x86_64/s6-networking  | 74 ++++++++++++++++++++++++++++++++++++--------------------------------------
M variants/root-x86_64/s6-portable-utils  | 66 ++++++++++++++++++++++++++++++++----------------------------------
M variants/root-x86_64/s6-rc  | 70 ++++++++++++++++++++++++++++++++++------------------------------------
M variants/root-x86_64/skalibs  | 62 ++++++++++++++++++++++++++++++--------------------------------
M variants/root-x86_64/snaprep  | 60 ++++++++++++++++++++++++++++++------------------------------
M variants/root-x86_64/squashfs-tools  | 68 +++++++++++++++++++++++++++++++++-----------------------------------
M variants/root-x86_64/strace  | 70 ++++++++++++++++++++++++++++++++++------------------------------------
M variants/root-x86_64/system-config  | 130 ++++++++++++++++++++++++++++++++++++++++----------------------------------------
M variants/root-x86_64/system-config-init  | 108 ++++++++++++++++++++++++++++++++++++++++----------------------------------------
M variants/root-x86_64/system-config-rc  | 66 +++++++++++++++++++++++++++++++++---------------------------------
M variants/root-x86_64/system-config-scripts  | 60 ++++++++++++++++++++++++++++++------------------------------
M variants/root-x86_64/system-config-zsh  | 58 +++++++++++++++++++++++++++++-----------------------------
M variants/root-x86_64/tinyssh  | 64 +++++++++++++++++++++++++++++++---------------------------------
M variants/root-x86_64/user-env  | 60 ++++++++++++++++++++++++++++++------------------------------
M variants/root-x86_64/userspace.environment  | 184 +++++++++++++++++++++++++++++++++++++++----------------------------------------
M variants/root-x86_64/vm.environment  | 4 ++--
M variants/root-x86_64/xbps  | 68 +++++++++++++++++++++++++++++++++-----------------------------------
M variants/root-x86_64/zsh  | 70 ++++++++++++++++++++++++++++++++++------------------------------------
M variants/root-x86_64/zstd  | 64 +++++++++++++++++++++++++++++++---------------------------------

324 files changed, 7436 insertions(+), 7772 deletions(-)
diff --git a/templates/.swl b/templates/.swl
Binary files differ.
diff --git a/templates/package_sets b/templates/package_sets
@@ -19,12 +19,12 @@
 {%- endmacro %}
 
 {% macro toolchain() -%}
+#+{{pkg_install_name("musl-cross-make:old")}}
 {#-
-#+{{pkg_install_name("musl-cross-make")}}
--#}
 #+{{pkg_install_name("musl")}}
 #+{{pkg_install_name("gcc")}}
 #+{{pkg_install_name("binutils")}}
+-#}
 {%- endmacro %}
 
 {% macro busybox_compress() -%}
diff --git a/templates/pkg/gcc b/templates/pkg/gcc
@@ -37,6 +37,10 @@ find "$pthbs_build_environment/" -type l -print | while IFS= read -r lnk; do
 			;;
 	esac
 done
+mv "$sysroot/$prefix/{{dynlibdir}}"/* "$sysroot/$prefix/{{libdir}}"/
+rmdir "$sysroot/$prefix/{{dynlibdir}}"
+ln -s {{libdir|shesc}} "$sysroot/$prefix/{{dynlibdir}}"
+ln -s lib "$sysroot/$prefix/{{dynlibdir}}"
 mkdir -p "$sysroot/${musl%/*}"
 ln -s "$musl" "$sysroot/${musl%/*}"
 
diff --git a/variants/ccx-x86_64/aat b/variants/ccx-x86_64/aat
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+zsh.c9ff605cba8b7ab3cc834a858e600d75365f0d472df7827bc4304e7f2b161713
-#+pthbs-banginstall.098f2600d99924c8e1d79ad1af13fd2798200bbd23e06c680fa45a0c1cd627d7
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+zsh.5e6964dc3be6822ea25475d86d39ce18b171d6d4316ff2479a9848e06875367f
+#+pthbs-banginstall.d658ea1c780deb3de5fdce5161786491fd32c1dc84b863aa13a01bfaf15e0acf
 #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat
 
 
diff --git a/variants/ccx-x86_64/abduco b/variants/ccx-x86_64/abduco
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
 #@git:8c32909a159aaa9484c82b71f05b7a73321eb491:abduco
 
 
diff --git a/variants/ccx-x86_64/alpine-keys b/variants/ccx-x86_64/alpine-keys
@@ -1,32 +1,32 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
 #@git:c7b36ed27103ee3f9aa01905ba1fac2d606079cf:alpine-keys
 
 
diff --git a/variants/ccx-x86_64/apk-tools b/variants/ccx-x86_64/apk-tools
@@ -1,41 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+patch.f6b6edfce98acd976b39b2fe2cc9057d7473c71171f6f1789d72a8b122dda60c
-#+libressl.5014a45ebeba049f96b1442e3f11880d71f918c4ee444ae78ef1010ee65384c1
-#+zstd.06b8da2f7f8fbd89ec0350960d26c5fcc28a73147508ac97ebd1387dbe0f9b78
-#+pkgconf-pkg-config.d3742713161040dc06f12581b7c382adf6a4dec2d676d0515d10152e750b39f6
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+patch.5272590ddc980d98e6454b3fa5b4ad4cbf1f937c6bbdae97e024e6240b2db58b
+#+libressl.cd8c8972c5fd319c44b2708144ca27ea42b323dd57d79ba4e631e52bcd30e275
+#+zstd.c03a460188a9d2b637fe5761a111c00b9aec370688e0246cb3d763100991f226
+#+pkgconf-pkg-config.100f94e0a60eeae8adf1f3d33293786acf9b7cd06132d267a485368568cbcc4b
 #@sha256:4b32a05f12c3d29befb210c88c415f7c7affd7e351b9e96b0cfde50773d22dbd:apk-tools.patch
 #@git:9d074efdc12bc41b5d24190595a5269a770e852a:apk-tools
 
diff --git a/variants/ccx-x86_64/applyuidgid-caps b/variants/ccx-x86_64/applyuidgid-caps
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+skalibs.5456da6512d0aa9a7f27efc983555eda5280accfc3dbab64be95086e2eeaea53
-#+libcap.a5e29dc6d6519500cf638a71bf0a0470576db64ff4de8393dded5c225725e5b4
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+skalibs.fdc273713250725a8bcf3add5ec6161ff7b7d504eb30febdc27a0520c891b329
+#+libcap.b53bdc820b5cd0adc396aedbdd5f0406c2eef479e4df6ba54bb1f24f1e0a3ad9
 #@sha256:818a5ad7061ab1a740a5c2e7d7d8cdcc7be7e84e3f04b479731cf94ff1f1d093:applyuidgid-caps.c
 
 
diff --git a/variants/ccx-x86_64/argp-standalone b/variants/ccx-x86_64/argp-standalone
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+m4.0c844229567ffdfcd436bc4d8ac5e6a19154427bccc49379b4f855b1ed3ce7e1
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+m4.3353c8ccf091da3cfebd3dae109d466a1467afb4d8a762db92a1e57b3bb70b1c
 #@untar:-z:sha256:c29eae929dfebd575c38174f2c8c315766092cec99a8f987569d0cad3c6d64f6:.
 #@untar::sha256:a4facc0856b512ad8ab5aed7b07e14a9629aaf042b1e92377ba22fcfc4c4205b:argp-standalone-1.5.0
 
diff --git a/variants/ccx-x86_64/attr b/variants/ccx-x86_64/attr
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+m4.0c844229567ffdfcd436bc4d8ac5e6a19154427bccc49379b4f855b1ed3ce7e1
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+m4.3353c8ccf091da3cfebd3dae109d466a1467afb4d8a762db92a1e57b3bb70b1c
 #@untar:-z:sha256:39bf67452fa41d0948c2197601053f48b3d78a029389734332a6309a680c6c87:.
 
 
diff --git a/variants/ccx-x86_64/bison b/variants/ccx-x86_64/bison
@@ -1,39 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+m4.0c844229567ffdfcd436bc4d8ac5e6a19154427bccc49379b4f855b1ed3ce7e1
-#+flex.f48cb27e48bb9d2db6755b12817419a61d1512ac9dadeb38767de2a7e69f3dba
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+m4.3353c8ccf091da3cfebd3dae109d466a1467afb4d8a762db92a1e57b3bb70b1c
+#+flex.e37d4b764fbfd05e10ccdcd2b972e8947ea57e7c55b9457bac56df108430020b
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
 
diff --git a/variants/ccx-x86_64/busybox b/variants/ccx-x86_64/busybox
@@ -1,7 +1,5 @@
 #!/usr/bin/env pthbs-build
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
 #+gnu-make.14802bec28edc645ca1a7a23446f40dab46713a04ef11560c6ad30dedc6501d1
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
 #@sha256:31b8f61d2173fa36d4409e8e91f52088691d6ba4db13efe19ea7ae7512e64275:busybox/.config
diff --git a/variants/ccx-x86_64/busybox-ash b/variants/ccx-x86_64/busybox-ash
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-attr b/variants/ccx-x86_64/busybox-attr
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-awk b/variants/ccx-x86_64/busybox-awk
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-bc b/variants/ccx-x86_64/busybox-bc
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-bzip2 b/variants/ccx-x86_64/busybox-bzip2
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-chpst b/variants/ccx-x86_64/busybox-chpst
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-console b/variants/ccx-x86_64/busybox-console
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-coreutils b/variants/ccx-x86_64/busybox-coreutils
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-coreutils-extra b/variants/ccx-x86_64/busybox-coreutils-extra
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-cpio b/variants/ccx-x86_64/busybox-cpio
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-cron b/variants/ccx-x86_64/busybox-cron
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-daemontools b/variants/ccx-x86_64/busybox-daemontools
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-diffutils b/variants/ccx-x86_64/busybox-diffutils
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-dosfstools b/variants/ccx-x86_64/busybox-dosfstools
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-dpkg b/variants/ccx-x86_64/busybox-dpkg
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-e2fsprogs b/variants/ccx-x86_64/busybox-e2fsprogs
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-ed b/variants/ccx-x86_64/busybox-ed
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-findutils b/variants/ccx-x86_64/busybox-findutils
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-getty b/variants/ccx-x86_64/busybox-getty
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-grep b/variants/ccx-x86_64/busybox-grep
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-gzip b/variants/ccx-x86_64/busybox-gzip
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-i2c-tools b/variants/ccx-x86_64/busybox-i2c-tools
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-iproute2 b/variants/ccx-x86_64/busybox-iproute2
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-iputils b/variants/ccx-x86_64/busybox-iputils
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-kbd b/variants/ccx-x86_64/busybox-kbd
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-linux-extra b/variants/ccx-x86_64/busybox-linux-extra
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-logging b/variants/ccx-x86_64/busybox-logging
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-login b/variants/ccx-x86_64/busybox-login
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-lzop b/variants/ccx-x86_64/busybox-lzop
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-misc b/variants/ccx-x86_64/busybox-misc
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-modutils b/variants/ccx-x86_64/busybox-modutils
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-mtd-utils b/variants/ccx-x86_64/busybox-mtd-utils
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-net-misc b/variants/ccx-x86_64/busybox-net-misc
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-net-tools b/variants/ccx-x86_64/busybox-net-tools
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-process-extra b/variants/ccx-x86_64/busybox-process-extra
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-procps b/variants/ccx-x86_64/busybox-procps
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-psmisc b/variants/ccx-x86_64/busybox-psmisc
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-rpm b/variants/ccx-x86_64/busybox-rpm
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-sed b/variants/ccx-x86_64/busybox-sed
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-sh b/variants/ccx-x86_64/busybox-sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-shadow b/variants/ccx-x86_64/busybox-shadow
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-su b/variants/ccx-x86_64/busybox-su
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-tar b/variants/ccx-x86_64/busybox-tar
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-traceroute b/variants/ccx-x86_64/busybox-traceroute
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-unzip b/variants/ccx-x86_64/busybox-unzip
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-util-linux-priv b/variants/ccx-x86_64/busybox-util-linux-priv
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-util-linux-unpriv b/variants/ccx-x86_64/busybox-util-linux-unpriv
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-vi b/variants/ccx-x86_64/busybox-vi
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-wget b/variants/ccx-x86_64/busybox-wget
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-xxd b/variants/ccx-x86_64/busybox-xxd
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-xz b/variants/ccx-x86_64/busybox-xz
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox:modutils b/variants/ccx-x86_64/busybox:modutils
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+linux-qemu-guest.5a044650e626a0b2b2f131f92f3b5ae497365a55e417d210c1f8ef7e6c0d95b3
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
+#+linux-qemu-guest.9f0d35996ef7c9f3a46c17c468ca88a7058189ef4484fee6b6f629a2a8b3c750
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
 #@sha256:ccb459010923e1a9b49cb39d45bc93d0fc8749acea6efd7b19cfb00e76a5562e:busybox/.config
 #@git:3621595939e43a831d66f6b757d4f410029bff95:busybox
 
@@ -62,7 +60,7 @@ export CFLAGS="-D_GNU_SOURCE"
 export LDFLAGS="-static"
 # TODO: indirection via deps directory/symlink
 cat >>.config <<EOF
-CONFIG_DEFAULT_MODULES_DIR="/home/ccx/versions/linux-qemu-guest.5a044650e626a0b2b2f131f92f3b5ae497365a55e417d210c1f8ef7e6c0d95b3"
+CONFIG_DEFAULT_MODULES_DIR="/home/ccx/versions/linux-qemu-guest.9f0d35996ef7c9f3a46c17c468ca88a7058189ef4484fee6b6f629a2a8b3c750"
 EOF
 make oldconfig
 cat .config
diff --git a/variants/ccx-x86_64/ca-certificates-wip-donotuse b/variants/ccx-x86_64/ca-certificates-wip-donotuse
@@ -1,33 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+certdata2pem.a088ae7cc72cd7d85353d776476364daa0a088250069259f04937c7d1cd428f7
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+certdata2pem.381052dee11b06b9d3a026a79daaa00841340580287dad5265d7457823b3d44b
 #@untar:-j:sha256:6ef7bc56cc0e0b307d99a3c494119686091cc1d4ad08986d68aa089dd00c7788:.
 
 
diff --git a/variants/ccx-x86_64/ccx-utils b/variants/ccx-x86_64/ccx-utils
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+skalibs.5456da6512d0aa9a7f27efc983555eda5280accfc3dbab64be95086e2eeaea53
-#+s6.d963ad9ca000b880b0cf6e44b9207bdfe338fae5c5ef132c623413d38ba3ba83
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+skalibs.fdc273713250725a8bcf3add5ec6161ff7b7d504eb30febdc27a0520c891b329
+#+s6.34c09d31d26075ada62b33cf0d7269415af83e8dd45a5ce28121cc55cac022c4
 #@git:461a9ec198c1e2b9c39a34e21786747dbb8671b4:ccx-utils
 
 
diff --git a/variants/ccx-x86_64/certdata2pem b/variants/ccx-x86_64/certdata2pem
@@ -1,35 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
 #@sha256:064f7d41106cd9efa08b9e68cf049f44e3be55666bd2ab96d02c508293b8dce7:certdata2pem.c
 
 
diff --git a/variants/ccx-x86_64/confz b/variants/ccx-x86_64/confz
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+zsh.c9ff605cba8b7ab3cc834a858e600d75365f0d472df7827bc4304e7f2b161713
-#+pthbs-banginstall.098f2600d99924c8e1d79ad1af13fd2798200bbd23e06c680fa45a0c1cd627d7
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+zsh.5e6964dc3be6822ea25475d86d39ce18b171d6d4316ff2479a9848e06875367f
+#+pthbs-banginstall.d658ea1c780deb3de5fdce5161786491fd32c1dc84b863aa13a01bfaf15e0acf
 #@git:c6aef8098d37a1773439117a5674bfc8662ef62b:confz
 
 
diff --git a/variants/ccx-x86_64/container-bin-image b/variants/ccx-x86_64/container-bin-image
@@ -1,60 +1,60 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-dosfstools.09e8c07fe43511248b8e976df0a7f09e90cf353cd235baf3d3a207aca132a158
-#+busybox-e2fsprogs.98e6a090002a1b2834f2ddd71211f52b662e414006a8c520b4596552a894c777
-#+busybox-iproute2.b46f4e1870a13357c575b5e48db34ba7f98e48b7a838ae7027983202a841edc6
-#+busybox-iputils.af9643b60639844e67e066519c692023160e3f94962f86e8e00799e341371acb
-#+busybox-net-misc.7c1a2a37d675a3930447230c1b052ae893e07b3d47b463382d2323e9655ea91e
-#+busybox-net-tools.c0927850259a3cef38d03ef44fd5a6caefa280c1e74f3bbe160c8ce359c022d9
-#+busybox-traceroute.2f574f2b25afda19655180dc3711feac3951774f3103e52f92e0372a9b94da66
-#+busybox-wget.43ecada93e7662300d0da3f4bb0f290c38b1769e75103707fcf92d696e4489e2
-#+busybox-chpst.1c1d5088326b9e97edd30dd2bdd438119ea24e12fccf40f9b2471161ce873fb1
-#+busybox-console.3ea8a865657409661d0601333c1f5d8bd79b9882c6af044814db4f50a8525188
-#+busybox-getty.a66d68cf25da8fac3cf8b1bed75b80300b967eec6a347ebdbabc5d824282adfe
-#+busybox-i2c-tools.bdde4180b4913462c43e44dd6fb39bcee3fc259dae690b95faccb7f3a24276a7
-#+busybox-linux-extra.a4208dfef25dc347b43cce38b89e7c00dd39acf339ebc78fb8e82cc887a89a6e
-#+busybox-mtd-utils.02263cef188489ba3db0ee5d07168a92aa8c4e4664785890ec00b1be7de633ff
-#+busybox-shadow.ba5c90664e648aa730a9f4c133a272f31bdd0b2807efaea6e44b960506049214
-#+busybox-su.972ae119d66a49ca52b33a4ab46cc5c9c5aa3db857e132e3f6ad7a9329010dc2
-#+busybox-util-linux-priv.83fd134d100cc6ab7c12f10afd0a51e9be28be7335dc2beea1ee01c722822a6f
-#+busybox-logging.9991dbce9a635e00954425a5aa899d8aa6b68e566bf000118502542f301af8b3
-#+busybox-cron.a059ab9c97b239a9d0a27f246a09d7ed31238e45bf21c754474a1034cf20ad6f
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-login.fe36b0457b6a04cfb13857658c9427bed0ad8927dcc07426779f3ab4a7dcd0c8
-#+execline.b87277dfe0acb94786dab9a874a9d2ad37b5db424de8e17e6e363fef332b6766
-#+s6.d963ad9ca000b880b0cf6e44b9207bdfe338fae5c5ef132c623413d38ba3ba83
-#+ccx-utils.92d4108871f348231ea5b358312d1bb9dfbb434d0d535ece261773ba22290c1b
-#+applyuidgid-caps.a235f6491dccd6544e06162af44dc59775310995b3dccc784ca829f89feee9d5
-#+easyseccomp.869bb9494cef2dc1e47588b78faaa26820d4dcae61f842d79364244ff35d95fc
-#+mlog.aa2de6bd06c0f4c3936da1fdaaed1c426516582248fa7cec37624aae774c5913
-#+abduco.f4eb53fedd4125157c2e3373007847924ceb86e5e59ccddc5cf39471be9d7977
-#+nawk.5f1f4b2334ef21dfe9770754962a16a9d0bedb9795a4a61914d0a4c06423dfdc
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-dosfstools.074e7ac6f86295033f8599b74fa9df92b291baba4fd3b5bc0aca4067a247c873
+#+busybox-e2fsprogs.9291576bf241ac2a8136b1515f10bc38b7b8ed74101a97a8b7f6d8743c742f91
+#+busybox-iproute2.93067047ba7dd262538a7fafb3e0f0efdde7e9f89199a5d19d9c485cc080d73a
+#+busybox-iputils.51a82d350eea617752239f5398df3c4c2951fb8634a69596d9951321065a8abb
+#+busybox-net-misc.90b1234bbbad66e9538e49e8a9c7630542e8d1895872db1c478ca1f942a8ae1c
+#+busybox-net-tools.2e0c91ab8dcd470a4a7e5e770705144478e56c31972b69bfd3475690a01f8f81
+#+busybox-traceroute.21e3cbe48767842789944452d0997a705e6035eb5ec42eb41263e5e7b60a8ed1
+#+busybox-wget.e647ed31cec5707850c15bdf123a066d5800966761038897f1ed6c56d908a1a2
+#+busybox-chpst.dc07b73f710cbad446343fa09a8fef8ee8184ac50e6e82cf4afaff4353dcdd2e
+#+busybox-console.1034e05c2f70346f2e9c847603dbf9e3be37fc759d5cc4522addb0d05477e4a0
+#+busybox-getty.1d5ad8b877058aded48b7e4e4886c31ae813a6fe61b1d3f3357b151cb5d71d48
+#+busybox-i2c-tools.30f44eff3ba62b1fe0e6862a058aae3046326e985e1b15deed8a1286d2d8676f
+#+busybox-linux-extra.888e992de26923278c987256e857716d04af400741b65e70235e45999d091536
+#+busybox-mtd-utils.6adb145c1a674e9bd17f9fbb8de2685d012aba46328a0f4e4be87cf2190ac570
+#+busybox-shadow.be5c1f3eab07d1d2d08d160e334d4aa8d77ee9eebd0af5214a22e07fc9b4f547
+#+busybox-su.f7e8c4a880fc2f2c9efc603227ef3643f5f2560310299b4dd5182501be0758ff
+#+busybox-util-linux-priv.5377559d96ce4229535cd0605dc511e76ffe95c56a87c7df4021ebbb039fb805
+#+busybox-logging.ca771c2979623accaa0452dad1c9494699f646f4a9ccd865969a57ba49bb9da9
+#+busybox-cron.8d0c19a36baeffdb7b3da8488569af29cfc9e0f1a207a8460cdfee21616c3f18
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-login.ea4f897f6a7e2a14f31c2ac1362cb5257331807f1d134556f2be3a0c0763dff5
+#+execline.5f80fdb7ce341ec75727ca2fd6170200fceef77821d4dd3e9e55a4b6bc7607d9
+#+s6.34c09d31d26075ada62b33cf0d7269415af83e8dd45a5ce28121cc55cac022c4
+#+ccx-utils.320116e7d9c60e50b3570c43e7cb8a5add24522635b7adebd0c9890ad9fb8d95
+#+applyuidgid-caps.e2aff655dc84b63b5a11e72534e7ee0e811902de72456461c18fcae833e48aad
+#+easyseccomp.1ba90f05f151fcd725d4ecdb2a0a74464c31e5530a265b108d973fb78c473c9c
+#+mlog.2003a5f8995e6f9bc2d6448bdc4f0cae53ca8e654e896ca77214ebdb7df01c6a
+#+abduco.dc70ed4e2abb5f66975c95865b7ed51fecf61ed10ffab89d18a040bf94882882
+#+nawk.0ffb368f1e19d8db634f7c2bcdb4b670f58e1509446bf8d5a4f5243b10a46483
 #@sha256:b9236c0fd504ffbc56f65d0522d2acadcd2683380eaa6f1873e8201eaa7388a5:default-policy.easyseccomp
 
 img="$pthbs_destdir/home/ccx/versions/$pthbs_package/container-bin-image"
diff --git a/variants/ccx-x86_64/containers b/variants/ccx-x86_64/containers
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+zsh.c9ff605cba8b7ab3cc834a858e600d75365f0d472df7827bc4304e7f2b161713
-#+pthbs-banginstall.098f2600d99924c8e1d79ad1af13fd2798200bbd23e06c680fa45a0c1cd627d7
-#+execline.b87277dfe0acb94786dab9a874a9d2ad37b5db424de8e17e6e363fef332b6766
-#+alpine-keys.911190c2ab457282c98e5a554f786c2cf03acb4ef55bc77307298b3fbe7e2200
-#+apk-tools.4c74134ce256ba348307193c509d44f22c37a1baca8d43c067f6a4bba8775fac
-#+xbps.8baac699617c923f72e15d3697ae36def15f4cc793cd990caaa82caf3c2ab9e8
-#+container-bin-image.a7da5125b544998385848766ea9b764f70238bbf7225736823c0c973d992aeba
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+zsh.5e6964dc3be6822ea25475d86d39ce18b171d6d4316ff2479a9848e06875367f
+#+pthbs-banginstall.d658ea1c780deb3de5fdce5161786491fd32c1dc84b863aa13a01bfaf15e0acf
+#+execline.5f80fdb7ce341ec75727ca2fd6170200fceef77821d4dd3e9e55a4b6bc7607d9
+#+alpine-keys.f2b227f4e232b199055fe95e3d5449ca39c4cd7c4dbd4cc864bf665aeec9b3f2
+#+apk-tools.abd3ea463cdb72c7b24a23278890904a284ae8e05e0b228b57929ac71f483421
+#+xbps.66ad29067bd245c7e3e8a7a7a2a76d11b6462764f6703d6d07c536ad31b80c2d
+#+container-bin-image.a1e893521d1cef92880fe210de77cde3f976def7affd31cf7ac3712be11a60bb
 #@git:9820dbea1cf5060d7d04632f0fed7e91ea608309:containers
 
 
@@ -76,10 +76,10 @@ printf '%s\n' >"${dest}/zsh/site-functions/confz_containers_pthbs_init" \
 	"typeset -g container_xbps_install_executable='$prefix/deps/command/xbps-install.static'"
 
 mkdir -p "${dest}/deps/command"
-ln -sf '/home/ccx/versions/apk-tools.4c74134ce256ba348307193c509d44f22c37a1baca8d43c067f6a4bba8775fac/command/apk.static' "${dest}/deps/command/"
-ln -sf '/home/ccx/versions/xbps.8baac699617c923f72e15d3697ae36def15f4cc793cd990caaa82caf3c2ab9e8/command/xbps-install.static' "${dest}/deps/command/"
+ln -sf '/home/ccx/versions/apk-tools.abd3ea463cdb72c7b24a23278890904a284ae8e05e0b228b57929ac71f483421/command/apk.static' "${dest}/deps/command/"
+ln -sf '/home/ccx/versions/xbps.66ad29067bd245c7e3e8a7a7a2a76d11b6462764f6703d6d07c536ad31b80c2d/command/xbps-install.static' "${dest}/deps/command/"
 
-for f in '/home/ccx/versions/alpine-keys.911190c2ab457282c98e5a554f786c2cf03acb4ef55bc77307298b3fbe7e2200'/keys/alpine/*/*; do
+for f in '/home/ccx/versions/alpine-keys.f2b227f4e232b199055fe95e3d5449ca39c4cd7c4dbd4cc864bf665aeec9b3f2'/keys/alpine/*/*; do
 	test -f "$f"
 	d=$(basename "${f%/*}")
 	mkdir -p "${dest}/deps/keys/alpine/$d"
@@ -87,13 +87,13 @@ for f in '/home/ccx/versions/alpine-keys.911190c2ab457282c98e5a554f786c2cf03acb4
 done
  
 mkdir -p "${dest}/deps/keys/void"
-for f in '/home/ccx/versions/xbps.8baac699617c923f72e15d3697ae36def15f4cc793cd990caaa82caf3c2ab9e8'/keys/void/*; do
+for f in '/home/ccx/versions/xbps.66ad29067bd245c7e3e8a7a7a2a76d11b6462764f6703d6d07c536ad31b80c2d'/keys/void/*; do
 	ln -sf "$f" "${dest}/deps/keys/void/"
 done
 
-test -d '/home/ccx/versions/container-bin-image.a7da5125b544998385848766ea9b764f70238bbf7225736823c0c973d992aeba/container-bin-image'
-test -f '/home/ccx/versions/container-bin-image.a7da5125b544998385848766ea9b764f70238bbf7225736823c0c973d992aeba/container-bin-image/if'
-ln -sf '/home/ccx/versions/container-bin-image.a7da5125b544998385848766ea9b764f70238bbf7225736823c0c973d992aeba/container-bin-image' "${dest}/deps/"
+test -d '/home/ccx/versions/container-bin-image.a1e893521d1cef92880fe210de77cde3f976def7affd31cf7ac3712be11a60bb/container-bin-image'
+test -f '/home/ccx/versions/container-bin-image.a1e893521d1cef92880fe210de77cde3f976def7affd31cf7ac3712be11a60bb/container-bin-image/if'
+ln -sf '/home/ccx/versions/container-bin-image.a1e893521d1cef92880fe210de77cde3f976def7affd31cf7ac3712be11a60bb/container-bin-image' "${dest}/deps/"
  
 
 
diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment
@@ -1,64 +1,64 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-dosfstools.09e8c07fe43511248b8e976df0a7f09e90cf353cd235baf3d3a207aca132a158
-#+busybox-e2fsprogs.98e6a090002a1b2834f2ddd71211f52b662e414006a8c520b4596552a894c777
-#+busybox-iproute2.b46f4e1870a13357c575b5e48db34ba7f98e48b7a838ae7027983202a841edc6
-#+busybox-iputils.af9643b60639844e67e066519c692023160e3f94962f86e8e00799e341371acb
-#+busybox-net-misc.7c1a2a37d675a3930447230c1b052ae893e07b3d47b463382d2323e9655ea91e
-#+busybox-net-tools.c0927850259a3cef38d03ef44fd5a6caefa280c1e74f3bbe160c8ce359c022d9
-#+busybox-traceroute.2f574f2b25afda19655180dc3711feac3951774f3103e52f92e0372a9b94da66
-#+busybox-wget.43ecada93e7662300d0da3f4bb0f290c38b1769e75103707fcf92d696e4489e2
-#+busybox-chpst.1c1d5088326b9e97edd30dd2bdd438119ea24e12fccf40f9b2471161ce873fb1
-#+busybox-console.3ea8a865657409661d0601333c1f5d8bd79b9882c6af044814db4f50a8525188
-#+busybox-getty.a66d68cf25da8fac3cf8b1bed75b80300b967eec6a347ebdbabc5d824282adfe
-#+busybox-i2c-tools.bdde4180b4913462c43e44dd6fb39bcee3fc259dae690b95faccb7f3a24276a7
-#+busybox-linux-extra.a4208dfef25dc347b43cce38b89e7c00dd39acf339ebc78fb8e82cc887a89a6e
-#+busybox-mtd-utils.02263cef188489ba3db0ee5d07168a92aa8c4e4664785890ec00b1be7de633ff
-#+busybox-shadow.ba5c90664e648aa730a9f4c133a272f31bdd0b2807efaea6e44b960506049214
-#+busybox-su.972ae119d66a49ca52b33a4ab46cc5c9c5aa3db857e132e3f6ad7a9329010dc2
-#+busybox-util-linux-priv.83fd134d100cc6ab7c12f10afd0a51e9be28be7335dc2beea1ee01c722822a6f
-#+busybox-logging.9991dbce9a635e00954425a5aa899d8aa6b68e566bf000118502542f301af8b3
-#+busybox-cron.a059ab9c97b239a9d0a27f246a09d7ed31238e45bf21c754474a1034cf20ad6f
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+execline.b87277dfe0acb94786dab9a874a9d2ad37b5db424de8e17e6e363fef332b6766
-#+s6.d963ad9ca000b880b0cf6e44b9207bdfe338fae5c5ef132c623413d38ba3ba83
-#+s6-portable-utils.36db3c4fd8df1eb3400beafd410407d0530b76911d0ba16f854981fb92d99dfb
-#+s6-linux-utils.518e846c1db76e253e16f978574433736fcaf5444bb9a06f3b1a585af49119db
-#+zsh.c9ff605cba8b7ab3cc834a858e600d75365f0d472df7827bc4304e7f2b161713
-#+confz.6570308f31a89659ff1960e1ad9cfba1d7c022416002707af279f5bff2c1445f
-#+containers.57d65c57f8d312c8bed4a59f75259097aca1ace5a190b9eba89d091bf0349a37
-#+xbps.8baac699617c923f72e15d3697ae36def15f4cc793cd990caaa82caf3c2ab9e8
-#+zstd.06b8da2f7f8fbd89ec0350960d26c5fcc28a73147508ac97ebd1387dbe0f9b78
-#+apk-tools.4c74134ce256ba348307193c509d44f22c37a1baca8d43c067f6a4bba8775fac
-#+alpine-keys.911190c2ab457282c98e5a554f786c2cf03acb4ef55bc77307298b3fbe7e2200
-#+getent.d0b13b7027c9012769e7e98faba58dcdac719d7ce4a3fe7f48dac77db17d35cd
-#+fileset.e51dcab7c21ef895507bd851870e6fc7f1877dc4fa63e4b55cde15cb7bd0e293
-#+ccx-utils.92d4108871f348231ea5b358312d1bb9dfbb434d0d535ece261773ba22290c1b
-#+easyseccomp.869bb9494cef2dc1e47588b78faaa26820d4dcae61f842d79364244ff35d95fc
-#+findutils.48585975c0a78bc86137cee9f57ed9e61302b74db403d4b575cdca8b357d57cc
-#+nawk.5f1f4b2334ef21dfe9770754962a16a9d0bedb9795a4a61914d0a4c06423dfdc-
\ No newline at end of file
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-dosfstools.074e7ac6f86295033f8599b74fa9df92b291baba4fd3b5bc0aca4067a247c873
+#+busybox-e2fsprogs.9291576bf241ac2a8136b1515f10bc38b7b8ed74101a97a8b7f6d8743c742f91
+#+busybox-iproute2.93067047ba7dd262538a7fafb3e0f0efdde7e9f89199a5d19d9c485cc080d73a
+#+busybox-iputils.51a82d350eea617752239f5398df3c4c2951fb8634a69596d9951321065a8abb
+#+busybox-net-misc.90b1234bbbad66e9538e49e8a9c7630542e8d1895872db1c478ca1f942a8ae1c
+#+busybox-net-tools.2e0c91ab8dcd470a4a7e5e770705144478e56c31972b69bfd3475690a01f8f81
+#+busybox-traceroute.21e3cbe48767842789944452d0997a705e6035eb5ec42eb41263e5e7b60a8ed1
+#+busybox-wget.e647ed31cec5707850c15bdf123a066d5800966761038897f1ed6c56d908a1a2
+#+busybox-chpst.dc07b73f710cbad446343fa09a8fef8ee8184ac50e6e82cf4afaff4353dcdd2e
+#+busybox-console.1034e05c2f70346f2e9c847603dbf9e3be37fc759d5cc4522addb0d05477e4a0
+#+busybox-getty.1d5ad8b877058aded48b7e4e4886c31ae813a6fe61b1d3f3357b151cb5d71d48
+#+busybox-i2c-tools.30f44eff3ba62b1fe0e6862a058aae3046326e985e1b15deed8a1286d2d8676f
+#+busybox-linux-extra.888e992de26923278c987256e857716d04af400741b65e70235e45999d091536
+#+busybox-mtd-utils.6adb145c1a674e9bd17f9fbb8de2685d012aba46328a0f4e4be87cf2190ac570
+#+busybox-shadow.be5c1f3eab07d1d2d08d160e334d4aa8d77ee9eebd0af5214a22e07fc9b4f547
+#+busybox-su.f7e8c4a880fc2f2c9efc603227ef3643f5f2560310299b4dd5182501be0758ff
+#+busybox-util-linux-priv.5377559d96ce4229535cd0605dc511e76ffe95c56a87c7df4021ebbb039fb805
+#+busybox-logging.ca771c2979623accaa0452dad1c9494699f646f4a9ccd865969a57ba49bb9da9
+#+busybox-cron.8d0c19a36baeffdb7b3da8488569af29cfc9e0f1a207a8460cdfee21616c3f18
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+execline.5f80fdb7ce341ec75727ca2fd6170200fceef77821d4dd3e9e55a4b6bc7607d9
+#+s6.34c09d31d26075ada62b33cf0d7269415af83e8dd45a5ce28121cc55cac022c4
+#+s6-portable-utils.6a9b8251669ba0d7df98415fce5af7e0228ec17adece0b60ba47973d0a9e3137
+#+s6-linux-utils.dfda52c5eeb2fce71d68f1abe6211859bc1b8097feaa1c38f74e567fa8acfbbf
+#+zsh.5e6964dc3be6822ea25475d86d39ce18b171d6d4316ff2479a9848e06875367f
+#+confz.92bc7695ac129a2e608c339c94219372c57f6fb46e73ed2fbfa119d69556800e
+#+containers.c9632acf86a68989d39a5ced84814314030b5716fdbcc6097411e5f0beb04d1f
+#+xbps.66ad29067bd245c7e3e8a7a7a2a76d11b6462764f6703d6d07c536ad31b80c2d
+#+zstd.c03a460188a9d2b637fe5761a111c00b9aec370688e0246cb3d763100991f226
+#+apk-tools.abd3ea463cdb72c7b24a23278890904a284ae8e05e0b228b57929ac71f483421
+#+alpine-keys.f2b227f4e232b199055fe95e3d5449ca39c4cd7c4dbd4cc864bf665aeec9b3f2
+#+getent.b09fecdd9dd058730e90b6e7b41d3a6f15e74a116f09c0d4dcbf18bf0c65df0c
+#+fileset.0f1c761e875fb3b456622c4b4e31010811fcaf0e74ed8514f38e84afb7394859
+#+ccx-utils.320116e7d9c60e50b3570c43e7cb8a5add24522635b7adebd0c9890ad9fb8d95
+#+easyseccomp.1ba90f05f151fcd725d4ecdb2a0a74464c31e5530a265b108d973fb78c473c9c
+#+findutils.7aaa6390fd43a315a90aefe4577dec7fa77d22b138516984558a1fec910565a2
+#+nawk.0ffb368f1e19d8db634f7c2bcdb4b670f58e1509446bf8d5a4f5243b10a46483+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/curl b/variants/ccx-x86_64/curl
@@ -1,39 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+m4.0c844229567ffdfcd436bc4d8ac5e6a19154427bccc49379b4f855b1ed3ce7e1
-#+libressl.5014a45ebeba049f96b1442e3f11880d71f918c4ee444ae78ef1010ee65384c1
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+m4.3353c8ccf091da3cfebd3dae109d466a1467afb4d8a762db92a1e57b3bb70b1c
+#+libressl.cd8c8972c5fd319c44b2708144ca27ea42b323dd57d79ba4e631e52bcd30e275
 #@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:.
 
 
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -1,99 +1,97 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-dosfstools.09e8c07fe43511248b8e976df0a7f09e90cf353cd235baf3d3a207aca132a158
-#+busybox-e2fsprogs.98e6a090002a1b2834f2ddd71211f52b662e414006a8c520b4596552a894c777
-#+busybox-iproute2.b46f4e1870a13357c575b5e48db34ba7f98e48b7a838ae7027983202a841edc6
-#+busybox-iputils.af9643b60639844e67e066519c692023160e3f94962f86e8e00799e341371acb
-#+busybox-net-misc.7c1a2a37d675a3930447230c1b052ae893e07b3d47b463382d2323e9655ea91e
-#+busybox-net-tools.c0927850259a3cef38d03ef44fd5a6caefa280c1e74f3bbe160c8ce359c022d9
-#+busybox-traceroute.2f574f2b25afda19655180dc3711feac3951774f3103e52f92e0372a9b94da66
-#+busybox-wget.43ecada93e7662300d0da3f4bb0f290c38b1769e75103707fcf92d696e4489e2
-#+busybox-chpst.1c1d5088326b9e97edd30dd2bdd438119ea24e12fccf40f9b2471161ce873fb1
-#+busybox-console.3ea8a865657409661d0601333c1f5d8bd79b9882c6af044814db4f50a8525188
-#+busybox-getty.a66d68cf25da8fac3cf8b1bed75b80300b967eec6a347ebdbabc5d824282adfe
-#+busybox-i2c-tools.bdde4180b4913462c43e44dd6fb39bcee3fc259dae690b95faccb7f3a24276a7
-#+busybox-linux-extra.a4208dfef25dc347b43cce38b89e7c00dd39acf339ebc78fb8e82cc887a89a6e
-#+busybox-mtd-utils.02263cef188489ba3db0ee5d07168a92aa8c4e4664785890ec00b1be7de633ff
-#+busybox-shadow.ba5c90664e648aa730a9f4c133a272f31bdd0b2807efaea6e44b960506049214
-#+busybox-su.972ae119d66a49ca52b33a4ab46cc5c9c5aa3db857e132e3f6ad7a9329010dc2
-#+busybox-util-linux-priv.83fd134d100cc6ab7c12f10afd0a51e9be28be7335dc2beea1ee01c722822a6f
-#+busybox-logging.9991dbce9a635e00954425a5aa899d8aa6b68e566bf000118502542f301af8b3
-#+busybox-cron.a059ab9c97b239a9d0a27f246a09d7ed31238e45bf21c754474a1034cf20ad6f
-#+attr.3b9678e2d6ff6328c39382b347dac4eba14dec414ebfa3c5d86f07dddcaf2d44
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+diffutils.c3fc24f6c64356a5a4fc6695b9f1348f3530184edd0481de43fc5316b15f6db8
-#+patch.f6b6edfce98acd976b39b2fe2cc9057d7473c71171f6f1789d72a8b122dda60c
-#+flex.f48cb27e48bb9d2db6755b12817419a61d1512ac9dadeb38767de2a7e69f3dba
-#+bison.9513e3c994e065861ffc9797e92e157593a5202399f921e98631feea7384e043
-#+rsync.afc95c58c9466446ffc6091c464459fcd789a64a39e93f75e6e2beae97cfd9c2
-#+execline.b87277dfe0acb94786dab9a874a9d2ad37b5db424de8e17e6e363fef332b6766
-#+s6.d963ad9ca000b880b0cf6e44b9207bdfe338fae5c5ef132c623413d38ba3ba83
-#+s6-rc.555380a64902b1fb0ebc0ade63ab705e13e56bdf67f6bdcabca12089d62a14b9
-#+s6-portable-utils.36db3c4fd8df1eb3400beafd410407d0530b76911d0ba16f854981fb92d99dfb
-#+s6-linux-utils.518e846c1db76e253e16f978574433736fcaf5444bb9a06f3b1a585af49119db
-#+s6-linux-init.7a29c7b707e3b5531c0ccf6734c0681f89d9b4ff664e7da824c44bf7043cbb18
-#+mdevd.930127dac6eecae899be404cbcc311aa2247c3427ade9c4bb1111a4fc5d3d1de
-#+s6-dns.8e249fe6c12b209c5354d27555ae7f7e6bbce94794d138b9947a4e2385339db2
-#+libressl.5014a45ebeba049f96b1442e3f11880d71f918c4ee444ae78ef1010ee65384c1
-#+s6-networking.8c9fa8b1b83f4f94cf3529e37df45a0fa08d8e62ed2c86ba963480dbaa5ca265
-#+zsh.c9ff605cba8b7ab3cc834a858e600d75365f0d472df7827bc4304e7f2b161713
-#+pthbs-banginstall.098f2600d99924c8e1d79ad1af13fd2798200bbd23e06c680fa45a0c1cd627d7
-#+aat.afa1d64dc4cd53d5f61c5887a7aa0c5c5d7274ebe214b4db1318cdf0af8c7560
-#+confz.6570308f31a89659ff1960e1ad9cfba1d7c022416002707af279f5bff2c1445f
-#+containers.57d65c57f8d312c8bed4a59f75259097aca1ace5a190b9eba89d091bf0349a37
-#+fileset.e51dcab7c21ef895507bd851870e6fc7f1877dc4fa63e4b55cde15cb7bd0e293
-#+logincaps.49c330489c7f46ac61de00f43eb2d5ff4ec53290deec4a9027dddabb62ec0841
-#+snaprep.efffc87c2f3ed669008770c48c0a0b4fd08324000e325c15be0464f2c28b6e83
-#+curl.924f5bac0fa3eced991606eb6ef2dbfc4783f5c45569f871ed82f5dd354fb268
-#+git.6448893d029ff67d9aa8a99c6d8a90c69218bdcedcba5c2700ee822704fd6008
-#+xbps.8baac699617c923f72e15d3697ae36def15f4cc793cd990caaa82caf3c2ab9e8
-#+apk-tools.4c74134ce256ba348307193c509d44f22c37a1baca8d43c067f6a4bba8775fac
-#+getent.d0b13b7027c9012769e7e98faba58dcdac719d7ce4a3fe7f48dac77db17d35cd
-#+getconf.9929ee975df8af08a213c7e249a2e66fa0cb2c67ec7042ebcdc366ba41a070c1
-#+iconv.91a633805dbda6baca1ffa34d45dd17259466066d3e79816de1ed336e9447840
-#+libcap.a5e29dc6d6519500cf638a71bf0a0470576db64ff4de8393dded5c225725e5b4
-#+applyuidgid-caps.a235f6491dccd6544e06162af44dc59775310995b3dccc784ca829f89feee9d5
-#+ccx-utils.92d4108871f348231ea5b358312d1bb9dfbb434d0d535ece261773ba22290c1b
-#+user-env.668680d21d323780f5f347345a908f5efde9280a07e849c852d513009939eb95
-#+strace.dcacdbacdbbc02be4d6c0ba5797af23913f2119591c0102cda962de895175091
-#+mlog.aa2de6bd06c0f4c3936da1fdaaed1c426516582248fa7cec37624aae774c5913
-#+findutils.48585975c0a78bc86137cee9f57ed9e61302b74db403d4b575cdca8b357d57cc
-#+nawk.5f1f4b2334ef21dfe9770754962a16a9d0bedb9795a4a61914d0a4c06423dfdc
-#+nvi.79ef60f9aa85bb7929e0e23650d3f49ef2e5006f32c86b821c81dfe6c562919f
-#+squashfs-tools.8b37a9701970fcd54ffafa8133e14dc5444bd612d43ae90fe08d9091812ee802
-#+mandoc.a7dc5276040de6070aaae641a5a4147b9a7544bc98c09db47a0b2947b267d16c
-#+tinyssh.9b7643c492d0ebba375406c0d8a8e0f83329a69edb24db5e506c82f2171cedba
-#+system-config.433a96ddf9be335eb3e7192e67aabf0dca52bd6b1704e753d05a7d2622fdb860
-#+system-config-rc.eaf437fda010bd4eeb7bf9a69c8f0b2418640698a90913b29016ce3cd1bd2958
-#+system-config-scripts.db59932a4e120de2f52bc3ba335e8844458faa41b5deed28e5587d58e7b402a7
-#+system-config-init.8a899322ad0e581e61c3b142284780f95102f6efc6a0282c5cbe5ae1b9116498
-#+system-config-zsh.a1c9fa377acd2d90ed9035bd2816e8b7fe5aa178829848c51299b07abab50f8a
-#+busybox.99f3c7039a4e6f368584f7093c5fe92fd8a05b3bd5ac548201e5f51dad078436-
\ No newline at end of file
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-dosfstools.074e7ac6f86295033f8599b74fa9df92b291baba4fd3b5bc0aca4067a247c873
+#+busybox-e2fsprogs.9291576bf241ac2a8136b1515f10bc38b7b8ed74101a97a8b7f6d8743c742f91
+#+busybox-iproute2.93067047ba7dd262538a7fafb3e0f0efdde7e9f89199a5d19d9c485cc080d73a
+#+busybox-iputils.51a82d350eea617752239f5398df3c4c2951fb8634a69596d9951321065a8abb
+#+busybox-net-misc.90b1234bbbad66e9538e49e8a9c7630542e8d1895872db1c478ca1f942a8ae1c
+#+busybox-net-tools.2e0c91ab8dcd470a4a7e5e770705144478e56c31972b69bfd3475690a01f8f81
+#+busybox-traceroute.21e3cbe48767842789944452d0997a705e6035eb5ec42eb41263e5e7b60a8ed1
+#+busybox-wget.e647ed31cec5707850c15bdf123a066d5800966761038897f1ed6c56d908a1a2
+#+busybox-chpst.dc07b73f710cbad446343fa09a8fef8ee8184ac50e6e82cf4afaff4353dcdd2e
+#+busybox-console.1034e05c2f70346f2e9c847603dbf9e3be37fc759d5cc4522addb0d05477e4a0
+#+busybox-getty.1d5ad8b877058aded48b7e4e4886c31ae813a6fe61b1d3f3357b151cb5d71d48
+#+busybox-i2c-tools.30f44eff3ba62b1fe0e6862a058aae3046326e985e1b15deed8a1286d2d8676f
+#+busybox-linux-extra.888e992de26923278c987256e857716d04af400741b65e70235e45999d091536
+#+busybox-mtd-utils.6adb145c1a674e9bd17f9fbb8de2685d012aba46328a0f4e4be87cf2190ac570
+#+busybox-shadow.be5c1f3eab07d1d2d08d160e334d4aa8d77ee9eebd0af5214a22e07fc9b4f547
+#+busybox-su.f7e8c4a880fc2f2c9efc603227ef3643f5f2560310299b4dd5182501be0758ff
+#+busybox-util-linux-priv.5377559d96ce4229535cd0605dc511e76ffe95c56a87c7df4021ebbb039fb805
+#+busybox-logging.ca771c2979623accaa0452dad1c9494699f646f4a9ccd865969a57ba49bb9da9
+#+busybox-cron.8d0c19a36baeffdb7b3da8488569af29cfc9e0f1a207a8460cdfee21616c3f18
+#+attr.873d324e7164fbe489bbf3eef6e158b70615d7a927915a3bffd1ec049daed56e
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+diffutils.3d2e21b2ea04282ac99a7586f7918e4110cff8a7822a8424257e8960144fada0
+#+patch.5272590ddc980d98e6454b3fa5b4ad4cbf1f937c6bbdae97e024e6240b2db58b
+#+flex.e37d4b764fbfd05e10ccdcd2b972e8947ea57e7c55b9457bac56df108430020b
+#+bison.e42f39799b230f40fb038648ddbe5a5e205dec95a78c7afe4f442a23209419d7
+#+rsync.be8b13bec1cb7f02b7b1c66d74a2cd5603393a0fe4db3d41dd31d0d87563acd6
+#+execline.5f80fdb7ce341ec75727ca2fd6170200fceef77821d4dd3e9e55a4b6bc7607d9
+#+s6.34c09d31d26075ada62b33cf0d7269415af83e8dd45a5ce28121cc55cac022c4
+#+s6-rc.1e1a783a2d59e58a89d9fdaa703d83815c178bfb708253d61925356c6bf8ecda
+#+s6-portable-utils.6a9b8251669ba0d7df98415fce5af7e0228ec17adece0b60ba47973d0a9e3137
+#+s6-linux-utils.dfda52c5eeb2fce71d68f1abe6211859bc1b8097feaa1c38f74e567fa8acfbbf
+#+s6-linux-init.bbba4c29191121de6c13c52371f29522a1f25dfb04d9ea75b60709cf09a93d12
+#+mdevd.2719882ff534bd8b3b9846c2bc0d053a8d5119fd96c6eef352c057aee98ae4ee
+#+s6-dns.db0519790246853a73d8314a99f52b100a7b39d9498e4c24d4b61249d990b3c7
+#+libressl.cd8c8972c5fd319c44b2708144ca27ea42b323dd57d79ba4e631e52bcd30e275
+#+s6-networking.23a42aaf78a0f07bf01677d73204a05da4048a6c5b8757b7bd1bce02ae1f862c
+#+zsh.5e6964dc3be6822ea25475d86d39ce18b171d6d4316ff2479a9848e06875367f
+#+pthbs-banginstall.d658ea1c780deb3de5fdce5161786491fd32c1dc84b863aa13a01bfaf15e0acf
+#+aat.c09149d390780b3d1b7a3f0203167111b3d83373e264c56143f12f2af8915282
+#+confz.92bc7695ac129a2e608c339c94219372c57f6fb46e73ed2fbfa119d69556800e
+#+containers.c9632acf86a68989d39a5ced84814314030b5716fdbcc6097411e5f0beb04d1f
+#+fileset.0f1c761e875fb3b456622c4b4e31010811fcaf0e74ed8514f38e84afb7394859
+#+logincaps.bf57c98bac79354434bc20609490546706ce77f69d5b23704b42a0aa2fd5515a
+#+snaprep.98c82a76b7706ae037f1bdf7e61702aa80b5fb13553c75fc80b05fad14415777
+#+curl.1345acbd0f8b3f7bd03eae6617b7adfd3fca50d0ddab5d7b5dc713028cba506a
+#+git.bbb0f462d35b1359d01d7dc59716f9b3f8135ca39fe5926037b825222bc7639d
+#+xbps.66ad29067bd245c7e3e8a7a7a2a76d11b6462764f6703d6d07c536ad31b80c2d
+#+apk-tools.abd3ea463cdb72c7b24a23278890904a284ae8e05e0b228b57929ac71f483421
+#+getent.b09fecdd9dd058730e90b6e7b41d3a6f15e74a116f09c0d4dcbf18bf0c65df0c
+#+getconf.fa089cdd2b7841090a50b68454265f05e1fb3b8f314ff9eaee4599d4a78e1d97
+#+iconv.0a982c2e652aabf4fdcb7fb89105e02f87cc7e9f110991936198e8a7ffe90bc1
+#+libcap.b53bdc820b5cd0adc396aedbdd5f0406c2eef479e4df6ba54bb1f24f1e0a3ad9
+#+applyuidgid-caps.e2aff655dc84b63b5a11e72534e7ee0e811902de72456461c18fcae833e48aad
+#+ccx-utils.320116e7d9c60e50b3570c43e7cb8a5add24522635b7adebd0c9890ad9fb8d95
+#+user-env.c7d907f9c9d190143c516ce77a6cece490ed7534f039c8ed563a3bcce3e88e30
+#+strace.139e4927deab9216c8439bfa655db221187693c91c045eed4dc68627219e3318
+#+mlog.2003a5f8995e6f9bc2d6448bdc4f0cae53ca8e654e896ca77214ebdb7df01c6a
+#+findutils.7aaa6390fd43a315a90aefe4577dec7fa77d22b138516984558a1fec910565a2
+#+nawk.0ffb368f1e19d8db634f7c2bcdb4b670f58e1509446bf8d5a4f5243b10a46483
+#+nvi.97b78806190bcef1ae0429e84e66d129d156726e2f60f351a76ba50b12f89270
+#+squashfs-tools.ef5aecb9b8daa46b57784f67a22161110717e1ba8de6f5cb922d4fba0efdd1cd
+#+mandoc.ac63fd2fb09eb5d1e325d3e04c744526f7fe6e7a0d26d3ba2cd24644df27814c
+#+tinyssh.83608f173f06bad3ac18a7c55144048a784c93c7f39567dc58d73d2927e647be
+#+system-config.98838b17aab525261ae0079f11fd630a959efd697ca7afde2cc57cf2350c8560
+#+system-config-rc.07137bcc070d648740f4a143fce74e1383e5d7f155cdd80ef0d08d031ada08e0
+#+system-config-scripts.648af34cdb45988e4d506542342ae773901a91a83ff372214f04aba084a8b5ca
+#+system-config-init.ab6fa4530696646dbf7f696630b9968e956663e65b8814f3a6b9a93b58db62f7
+#+system-config-zsh.c46271e5ccb4a373e2e5fd988b0ae9de3f944505ca246b788590db65dbff1efe
+#+busybox.d06ba44874e4589df604d8bbac67dc5ef215b396ec062e788bdaaa7a879f8c23+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/diffutils b/variants/ccx-x86_64/diffutils
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+m4.0c844229567ffdfcd436bc4d8ac5e6a19154427bccc49379b4f855b1ed3ce7e1
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+m4.3353c8ccf091da3cfebd3dae109d466a1467afb4d8a762db92a1e57b3bb70b1c
 #@untar:-J:sha256:90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e:.
 
 
diff --git a/variants/ccx-x86_64/dune b/variants/ccx-x86_64/dune
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.e3c8672dadbaeb14c201cef0a00695fec44f9784417436ed35424e8578b74dc9
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+ocaml.5a0165a7d62a965c81cfa8d090daacabc439612221de6a5a12d0d53c30b3a5ab
 #@untar:-z:sha256:579c738f8ca191ba0a9b22dbe78f1377542442c9827cf4939f8964f09f9edb28:.
 
 
diff --git a/variants/ccx-x86_64/easyseccomp b/variants/ccx-x86_64/easyseccomp
@@ -1,44 +1,42 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+m4.0c844229567ffdfcd436bc4d8ac5e6a19154427bccc49379b4f855b1ed3ce7e1
-#+patch.f6b6edfce98acd976b39b2fe2cc9057d7473c71171f6f1789d72a8b122dda60c
-#+flex.f48cb27e48bb9d2db6755b12817419a61d1512ac9dadeb38767de2a7e69f3dba
-#+bison.9513e3c994e065861ffc9797e92e157593a5202399f921e98631feea7384e043
-#+libseccomp.147ee8c3e71f7b96022bfc0b61350354128acccdf0991c6b2a409232907d59ac
-#+error-standalone.748147d8349eb94573424f354af210b5dade252cd6343f82a509296bb58030b5
-#+argp-standalone.7b322a16d68f876c9cfa831586a1a0baa352a6d61f613644d268ef362d486ebb
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+m4.3353c8ccf091da3cfebd3dae109d466a1467afb4d8a762db92a1e57b3bb70b1c
+#+patch.5272590ddc980d98e6454b3fa5b4ad4cbf1f937c6bbdae97e024e6240b2db58b
+#+flex.e37d4b764fbfd05e10ccdcd2b972e8947ea57e7c55b9457bac56df108430020b
+#+bison.e42f39799b230f40fb038648ddbe5a5e205dec95a78c7afe4f442a23209419d7
+#+libseccomp.6ce01290839f8f76ae575ffb2f1e0d37a57e644d5046d601bf22c371a52e98f4
+#+error-standalone.f9969cee565c80afc704d02e2ed6f49f43ff112ce71b1b53e5223582c84a974e
+#+argp-standalone.948321fbbfb4876ca41556a4d0b3ce001084440cc41ce9a1060f7ff0c48e94ac
 #@untar::sha256:1b44a63d415c48ac68d210951fec8d4761d3522f3d82d53182e66fabe5e2f2cd:easyseccomp
 #@sha256:eec15ac67403946e9d988d485f11764cf313b4798efe01d40f951ff521a23d10:easyseccomp_fix_includes.patch
 #@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp
diff --git a/variants/ccx-x86_64/error-standalone b/variants/ccx-x86_64/error-standalone
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
 #@untar:-z:sha256:0e751989cea94e25d5166a6a1ed9bde218786e39dff82e1f01dff12fc78639d9:.
 
 
diff --git a/variants/ccx-x86_64/execline b/variants/ccx-x86_64/execline
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+skalibs.5456da6512d0aa9a7f27efc983555eda5280accfc3dbab64be95086e2eeaea53
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+skalibs.fdc273713250725a8bcf3add5ec6161ff7b7d504eb30febdc27a0520c891b329
 #@git:6c0957eb5e8eea2ffada4d7be08286f0e81d0527:execline
 
 
@@ -48,7 +46,7 @@ cd 'execline'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.5456da6512d0aa9a7f27efc983555eda5280accfc3dbab64be95086e2eeaea53/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.fdc273713250725a8bcf3add5ec6161ff7b7d504eb30febdc27a0520c891b329/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/ccx-x86_64/fileset b/variants/ccx-x86_64/fileset
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+zsh.c9ff605cba8b7ab3cc834a858e600d75365f0d472df7827bc4304e7f2b161713
-#+pthbs-banginstall.098f2600d99924c8e1d79ad1af13fd2798200bbd23e06c680fa45a0c1cd627d7
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+zsh.5e6964dc3be6822ea25475d86d39ce18b171d6d4316ff2479a9848e06875367f
+#+pthbs-banginstall.d658ea1c780deb3de5fdce5161786491fd32c1dc84b863aa13a01bfaf15e0acf
 #@git:1b161b09bc889d17ac0a4ccce2dc3e74b64e1433:fileset
 
 
diff --git a/variants/ccx-x86_64/findutils b/variants/ccx-x86_64/findutils
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+m4.0c844229567ffdfcd436bc4d8ac5e6a19154427bccc49379b4f855b1ed3ce7e1
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+m4.3353c8ccf091da3cfebd3dae109d466a1467afb4d8a762db92a1e57b3bb70b1c
 #@untar:-J:sha256:1387e0b67ff247d2abde998f90dfbf70c1491391a59ddfecb8ae698789f0a4f5:.
 
 
diff --git a/variants/ccx-x86_64/flex b/variants/ccx-x86_64/flex
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+m4.0c844229567ffdfcd436bc4d8ac5e6a19154427bccc49379b4f855b1ed3ce7e1
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+m4.3353c8ccf091da3cfebd3dae109d466a1467afb4d8a762db92a1e57b3bb70b1c
 #@untar:-z:sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995:.
 
 
diff --git a/variants/ccx-x86_64/gcc b/variants/ccx-x86_64/gcc
@@ -59,6 +59,10 @@ find "$pthbs_build_environment/" -type l -print | while IFS= read -r lnk; do
 			;;
 	esac
 done
+mv "$sysroot/$prefix/library.so"/* "$sysroot/$prefix/library"/
+rmdir "$sysroot/$prefix/library.so"
+ln -s 'library' "$sysroot/$prefix/library.so"
+ln -s lib "$sysroot/$prefix/library.so"
 mkdir -p "$sysroot/${musl%/*}"
 ln -s "$musl" "$sysroot/${musl%/*}"
 
diff --git a/variants/ccx-x86_64/getconf b/variants/ccx-x86_64/getconf
@@ -1,35 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
 #@sha256:d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae50e320aad247c:getconf.c
 
 
diff --git a/variants/ccx-x86_64/getent b/variants/ccx-x86_64/getent
@@ -1,35 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
 #@sha256:002c1a216f6bed0f816ab1cfebde94a0b127193ef410c36b2190599983e015b8:getent.c
 
 
diff --git a/variants/ccx-x86_64/git b/variants/ccx-x86_64/git
@@ -1,40 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+m4.0c844229567ffdfcd436bc4d8ac5e6a19154427bccc49379b4f855b1ed3ce7e1
-#+libressl.5014a45ebeba049f96b1442e3f11880d71f918c4ee444ae78ef1010ee65384c1
-#+curl.924f5bac0fa3eced991606eb6ef2dbfc4783f5c45569f871ed82f5dd354fb268
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+m4.3353c8ccf091da3cfebd3dae109d466a1467afb4d8a762db92a1e57b3bb70b1c
+#+libressl.cd8c8972c5fd319c44b2708144ca27ea42b323dd57d79ba4e631e52bcd30e275
+#+curl.1345acbd0f8b3f7bd03eae6617b7adfd3fca50d0ddab5d7b5dc713028cba506a
 #@untar:-J:sha256:f612c1abc63557d50ad3849863fc9109670139fc9901e574460ec76e0511adb9:.
 
 
diff --git a/variants/ccx-x86_64/gnu-make b/variants/ccx-x86_64/gnu-make
@@ -1,7 +1,5 @@
 #!/usr/bin/env pthbs-build
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
 #+gnu-make.14802bec28edc645ca1a7a23446f40dab46713a04ef11560c6ad30dedc6501d1
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
diff --git a/variants/ccx-x86_64/gperf b/variants/ccx-x86_64/gperf
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+m4.0c844229567ffdfcd436bc4d8ac5e6a19154427bccc49379b4f855b1ed3ce7e1
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+m4.3353c8ccf091da3cfebd3dae109d466a1467afb4d8a762db92a1e57b3bb70b1c
 #@untar:-z:sha256:588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2:.
 
 
diff --git a/variants/ccx-x86_64/iconv b/variants/ccx-x86_64/iconv
@@ -1,35 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
 #@sha256:f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7:iconv.c
 
 
diff --git a/variants/ccx-x86_64/kbd b/variants/ccx-x86_64/kbd
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+m4.0c844229567ffdfcd436bc4d8ac5e6a19154427bccc49379b4f855b1ed3ce7e1
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+m4.3353c8ccf091da3cfebd3dae109d466a1467afb4d8a762db92a1e57b3bb70b1c
 #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:.
 #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:.
 
diff --git a/variants/ccx-x86_64/kernel.environment b/variants/ccx-x86_64/kernel.environment
@@ -1,3 +1,3 @@
 #!/usr/bin/env pthbs-build
-#+linux-qemu-guest.5a044650e626a0b2b2f131f92f3b5ae497365a55e417d210c1f8ef7e6c0d95b3
-#+busybox.99f3c7039a4e6f368584f7093c5fe92fd8a05b3bd5ac548201e5f51dad078436-
\ No newline at end of file
+#+linux-qemu-guest.9f0d35996ef7c9f3a46c17c468ca88a7058189ef4484fee6b6f629a2a8b3c750
+#+busybox.d06ba44874e4589df604d8bbac67dc5ef215b396ec062e788bdaaa7a879f8c23+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/libarchive b/variants/ccx-x86_64/libarchive
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+m4.0c844229567ffdfcd436bc4d8ac5e6a19154427bccc49379b4f855b1ed3ce7e1
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+m4.3353c8ccf091da3cfebd3dae109d466a1467afb4d8a762db92a1e57b3bb70b1c
 #@untar:-J:sha256:04357661e6717b6941682cde02ad741ae4819c67a260593dfb2431861b251acb:.
 
 
diff --git a/variants/ccx-x86_64/libbsd b/variants/ccx-x86_64/libbsd
@@ -1,39 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+m4.0c844229567ffdfcd436bc4d8ac5e6a19154427bccc49379b4f855b1ed3ce7e1
-#+libmd.17c005837cda8b6e175018366faf789efcd91ac9cc80a5b5c3edf83acac97a54
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+m4.3353c8ccf091da3cfebd3dae109d466a1467afb4d8a762db92a1e57b3bb70b1c
+#+libmd.8b9681d3729e586ac48ecddd6ade60ff30ec59acd63cb52227c4004458e823e9
 #@untar:-J:sha256:55fdfa2696fb4d55a592fa9ad14a9df897c7b0008ddb3b30c419914841f85f33:.
 
 
diff --git a/variants/ccx-x86_64/libcap b/variants/ccx-x86_64/libcap
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+pkgconf-pkg-config.d3742713161040dc06f12581b7c382adf6a4dec2d676d0515d10152e750b39f6
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+pkgconf-pkg-config.100f94e0a60eeae8adf1f3d33293786acf9b7cd06132d267a485368568cbcc4b
 #@untar:-J:sha256:f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb:.
 
 
diff --git a/variants/ccx-x86_64/libcgroup b/variants/ccx-x86_64/libcgroup
@@ -1,41 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+m4.0c844229567ffdfcd436bc4d8ac5e6a19154427bccc49379b4f855b1ed3ce7e1
-#+flex.f48cb27e48bb9d2db6755b12817419a61d1512ac9dadeb38767de2a7e69f3dba
-#+bison.9513e3c994e065861ffc9797e92e157593a5202399f921e98631feea7384e043
-#+musl-fts.a35821727431c33a441835be160c20397c6f51aa12134ef81d26f063fd49b275
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+m4.3353c8ccf091da3cfebd3dae109d466a1467afb4d8a762db92a1e57b3bb70b1c
+#+flex.e37d4b764fbfd05e10ccdcd2b972e8947ea57e7c55b9457bac56df108430020b
+#+bison.e42f39799b230f40fb038648ddbe5a5e205dec95a78c7afe4f442a23209419d7
+#+musl-fts.4ce70f4d631728a6cb0a3b19db472f542165730b2c0b7d29e8c751f91963c802
 #@untar:-z:sha256:8d284d896fca1c981b55850e92acd3ad9648a69227c028dda7ae3402af878edd:.
 
 
diff --git a/variants/ccx-x86_64/libelf b/variants/ccx-x86_64/libelf
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+zstd.06b8da2f7f8fbd89ec0350960d26c5fcc28a73147508ac97ebd1387dbe0f9b78
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+zstd.c03a460188a9d2b637fe5761a111c00b9aec370688e0246cb3d763100991f226
 #@git:288355d104ff9930520c0283fe82556c6cc5c16f:libelf
 
 
diff --git a/variants/ccx-x86_64/libmd b/variants/ccx-x86_64/libmd
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+m4.0c844229567ffdfcd436bc4d8ac5e6a19154427bccc49379b4f855b1ed3ce7e1
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+m4.3353c8ccf091da3cfebd3dae109d466a1467afb4d8a762db92a1e57b3bb70b1c
 #@untar:-J:sha256:1bd6aa42275313af3141c7cf2e5b964e8b1fd488025caf2f971f43b00776b332:.
 
 
diff --git a/variants/ccx-x86_64/libressl b/variants/ccx-x86_64/libressl
@@ -1,39 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+m4.0c844229567ffdfcd436bc4d8ac5e6a19154427bccc49379b4f855b1ed3ce7e1
-#+ca-certificates-wip-donotuse.08f2f18d3679661007130c3ba155cf0dc25053422d9f68d87c3bef6629ce2e6c
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+m4.3353c8ccf091da3cfebd3dae109d466a1467afb4d8a762db92a1e57b3bb70b1c
+#+ca-certificates-wip-donotuse.38852e8d7e40f8fb3a9210961954c3ab9b557a4f043f166c167f2a48356d5b0b
 #@sha256:a68fedc0edd976b9f35ecfdcb252d80dc12084b1bc4e945be7dc42c437d8b540:c_rehash.c
 #@untar:-z:sha256:6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954:.
 
@@ -101,7 +99,7 @@ make DESTDIR="$pthbs_destdir" install
 
 cd ..
 gcc ./c_rehash.c -o c_rehash --static -static -I"$pthbs_destdir/$prefix/include" -L"$pthbs_destdir/$prefix/library" -lssl -lcrypto
-cp -vs '/home/ccx/versions/ca-certificates-wip-donotuse.08f2f18d3679661007130c3ba155cf0dc25053422d9f68d87c3bef6629ce2e6c/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/"
+cp -vs '/home/ccx/versions/ca-certificates-wip-donotuse.38852e8d7e40f8fb3a9210961954c3ab9b557a4f043f166c167f2a48356d5b0b/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/"
 ./c_rehash  "$pthbs_destdir/$prefix/config/ssl/certs/"
 cd  "$pthbs_destdir/$prefix/config/ssl/"
 mv cert.pem libressl-cert.pem
diff --git a/variants/ccx-x86_64/libseccomp b/variants/ccx-x86_64/libseccomp
@@ -1,40 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+m4.0c844229567ffdfcd436bc4d8ac5e6a19154427bccc49379b4f855b1ed3ce7e1
-#+pkgconf-pkg-config.d3742713161040dc06f12581b7c382adf6a4dec2d676d0515d10152e750b39f6
-#+gperf.3597c55323a490fd081656b13b8c79f8dd043116fbaae99cd0ebeb32ab1b1d42
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+m4.3353c8ccf091da3cfebd3dae109d466a1467afb4d8a762db92a1e57b3bb70b1c
+#+pkgconf-pkg-config.100f94e0a60eeae8adf1f3d33293786acf9b7cd06132d267a485368568cbcc4b
+#+gperf.d7416a73d3bb9216e90725f006469c00cdc720773794f240c29458368f5eea7c
 #@untar:-z:sha256:83b6085232d1588c379dc9b9cae47bb37407cf262e6e74993c61ba72d2a784dc:.
 
 
diff --git a/variants/ccx-x86_64/libunwind b/variants/ccx-x86_64/libunwind
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+m4.0c844229567ffdfcd436bc4d8ac5e6a19154427bccc49379b4f855b1ed3ce7e1
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+m4.3353c8ccf091da3cfebd3dae109d466a1467afb4d8a762db92a1e57b3bb70b1c
 #@untar:-z:sha256:ddf0e32dd5fafe5283198d37e4bf9decf7ba1770b6e7e006c33e6df79e6a6157:.
 
 
diff --git a/variants/ccx-x86_64/linux b/variants/ccx-x86_64/linux
@@ -1,46 +1,44 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nofail_digest
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-modutils.9c75bfbd35f2a449f5b2e1e5476226369a559fdbf3fe4334d99c6a150d275d54
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+findutils.48585975c0a78bc86137cee9f57ed9e61302b74db403d4b575cdca8b357d57cc
-#+diffutils.c3fc24f6c64356a5a4fc6695b9f1348f3530184edd0481de43fc5316b15f6db8
-#+patch.f6b6edfce98acd976b39b2fe2cc9057d7473c71171f6f1789d72a8b122dda60c
-#+flex.f48cb27e48bb9d2db6755b12817419a61d1512ac9dadeb38767de2a7e69f3dba
-#+bison.9513e3c994e065861ffc9797e92e157593a5202399f921e98631feea7384e043
-#+rsync.afc95c58c9466446ffc6091c464459fcd789a64a39e93f75e6e2beae97cfd9c2
-#+zstd.06b8da2f7f8fbd89ec0350960d26c5fcc28a73147508ac97ebd1387dbe0f9b78
-#+libelf.d1b09149e6486e65deb99fbe915fe036dc57fffaa52263b994aa40860d3150e2
-#+pkgconf-pkg-config.d3742713161040dc06f12581b7c382adf6a4dec2d676d0515d10152e750b39f6
-#+nawk.5f1f4b2334ef21dfe9770754962a16a9d0bedb9795a4a61914d0a4c06423dfdc
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-modutils.8fb355bbad69b5512651e770886f983d92a28b7a3b7f725573f183a2edee6873
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+findutils.7aaa6390fd43a315a90aefe4577dec7fa77d22b138516984558a1fec910565a2
+#+diffutils.3d2e21b2ea04282ac99a7586f7918e4110cff8a7822a8424257e8960144fada0
+#+patch.5272590ddc980d98e6454b3fa5b4ad4cbf1f937c6bbdae97e024e6240b2db58b
+#+flex.e37d4b764fbfd05e10ccdcd2b972e8947ea57e7c55b9457bac56df108430020b
+#+bison.e42f39799b230f40fb038648ddbe5a5e205dec95a78c7afe4f442a23209419d7
+#+rsync.be8b13bec1cb7f02b7b1c66d74a2cd5603393a0fe4db3d41dd31d0d87563acd6
+#+zstd.c03a460188a9d2b637fe5761a111c00b9aec370688e0246cb3d763100991f226
+#+libelf.b26f8b9e273e462f72b6b772637badb01820dbe3be7ad34552e842e00fd64197
+#+pkgconf-pkg-config.100f94e0a60eeae8adf1f3d33293786acf9b7cd06132d267a485368568cbcc4b
+#+nawk.0ffb368f1e19d8db634f7c2bcdb4b670f58e1509446bf8d5a4f5243b10a46483
 #@untar:-J:sha256:2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb:.
 #@sha256:d9b01e4dac3dd140c394227603c8b3339bb2f1e10c97afd3607d84e3003ec75a:patch-6.1.34.xz
 #@sha256:cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867:linux.config
diff --git a/variants/ccx-x86_64/linux-qemu-guest b/variants/ccx-x86_64/linux-qemu-guest
@@ -1,46 +1,44 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nofail_digest
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-modutils.9c75bfbd35f2a449f5b2e1e5476226369a559fdbf3fe4334d99c6a150d275d54
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+findutils.48585975c0a78bc86137cee9f57ed9e61302b74db403d4b575cdca8b357d57cc
-#+diffutils.c3fc24f6c64356a5a4fc6695b9f1348f3530184edd0481de43fc5316b15f6db8
-#+patch.f6b6edfce98acd976b39b2fe2cc9057d7473c71171f6f1789d72a8b122dda60c
-#+flex.f48cb27e48bb9d2db6755b12817419a61d1512ac9dadeb38767de2a7e69f3dba
-#+bison.9513e3c994e065861ffc9797e92e157593a5202399f921e98631feea7384e043
-#+rsync.afc95c58c9466446ffc6091c464459fcd789a64a39e93f75e6e2beae97cfd9c2
-#+zstd.06b8da2f7f8fbd89ec0350960d26c5fcc28a73147508ac97ebd1387dbe0f9b78
-#+libelf.d1b09149e6486e65deb99fbe915fe036dc57fffaa52263b994aa40860d3150e2
-#+pkgconf-pkg-config.d3742713161040dc06f12581b7c382adf6a4dec2d676d0515d10152e750b39f6
-#+nawk.5f1f4b2334ef21dfe9770754962a16a9d0bedb9795a4a61914d0a4c06423dfdc
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-modutils.8fb355bbad69b5512651e770886f983d92a28b7a3b7f725573f183a2edee6873
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+findutils.7aaa6390fd43a315a90aefe4577dec7fa77d22b138516984558a1fec910565a2
+#+diffutils.3d2e21b2ea04282ac99a7586f7918e4110cff8a7822a8424257e8960144fada0
+#+patch.5272590ddc980d98e6454b3fa5b4ad4cbf1f937c6bbdae97e024e6240b2db58b
+#+flex.e37d4b764fbfd05e10ccdcd2b972e8947ea57e7c55b9457bac56df108430020b
+#+bison.e42f39799b230f40fb038648ddbe5a5e205dec95a78c7afe4f442a23209419d7
+#+rsync.be8b13bec1cb7f02b7b1c66d74a2cd5603393a0fe4db3d41dd31d0d87563acd6
+#+zstd.c03a460188a9d2b637fe5761a111c00b9aec370688e0246cb3d763100991f226
+#+libelf.b26f8b9e273e462f72b6b772637badb01820dbe3be7ad34552e842e00fd64197
+#+pkgconf-pkg-config.100f94e0a60eeae8adf1f3d33293786acf9b7cd06132d267a485368568cbcc4b
+#+nawk.0ffb368f1e19d8db634f7c2bcdb4b670f58e1509446bf8d5a4f5243b10a46483
 #@untar:-J:sha256:7586962547803be7ecc4056efc927fb25214548722bd28171172f3599abb9764:.
 #@sha256:cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867:linux.config
 #@sha256:ff3ddd131d73fee6838b11a6c4773bdb85c5f60fdd4b9ac4120ced021c341417:noobjtool.patch
diff --git a/variants/ccx-x86_64/logincaps b/variants/ccx-x86_64/logincaps
@@ -1,39 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+zsh.c9ff605cba8b7ab3cc834a858e600d75365f0d472df7827bc4304e7f2b161713
-#+pthbs-banginstall.098f2600d99924c8e1d79ad1af13fd2798200bbd23e06c680fa45a0c1cd627d7
-#+execline.b87277dfe0acb94786dab9a874a9d2ad37b5db424de8e17e6e363fef332b6766
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ccx-utils.92d4108871f348231ea5b358312d1bb9dfbb434d0d535ece261773ba22290c1b
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+zsh.5e6964dc3be6822ea25475d86d39ce18b171d6d4316ff2479a9848e06875367f
+#+pthbs-banginstall.d658ea1c780deb3de5fdce5161786491fd32c1dc84b863aa13a01bfaf15e0acf
+#+execline.5f80fdb7ce341ec75727ca2fd6170200fceef77821d4dd3e9e55a4b6bc7607d9
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+ccx-utils.320116e7d9c60e50b3570c43e7cb8a5add24522635b7adebd0c9890ad9fb8d95
 #@git:409db79b3e7e5fc6b73305471d9bbb6ac5c14036:logincaps
 
 
diff --git a/variants/ccx-x86_64/m4 b/variants/ccx-x86_64/m4
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
 #@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:.
 
 
diff --git a/variants/ccx-x86_64/mandoc b/variants/ccx-x86_64/mandoc
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
 #@untar:-z:sha256:8bf0d570f01e70a6e124884088870cbed7537f36328d512909eb10cd53179d9c:.
 
 
diff --git a/variants/ccx-x86_64/mdev-scripts b/variants/ccx-x86_64/mdev-scripts
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+zsh.c9ff605cba8b7ab3cc834a858e600d75365f0d472df7827bc4304e7f2b161713
-#+pthbs-banginstall.098f2600d99924c8e1d79ad1af13fd2798200bbd23e06c680fa45a0c1cd627d7
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+zsh.5e6964dc3be6822ea25475d86d39ce18b171d6d4316ff2479a9848e06875367f
+#+pthbs-banginstall.d658ea1c780deb3de5fdce5161786491fd32c1dc84b863aa13a01bfaf15e0acf
 #@git:395634340de8349996fd273b055ae4bac9d2897c:mdev-scripts
 
 
diff --git a/variants/ccx-x86_64/mdevd b/variants/ccx-x86_64/mdevd
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+skalibs.5456da6512d0aa9a7f27efc983555eda5280accfc3dbab64be95086e2eeaea53
-#+execline.b87277dfe0acb94786dab9a874a9d2ad37b5db424de8e17e6e363fef332b6766
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+skalibs.fdc273713250725a8bcf3add5ec6161ff7b7d504eb30febdc27a0520c891b329
+#+execline.5f80fdb7ce341ec75727ca2fd6170200fceef77821d4dd3e9e55a4b6bc7607d9
 #@git:96aef400b9f9d14f3bf54b0e444e9ad3665c4107:mdevd
 
 
@@ -49,7 +47,7 @@ cd 'mdevd'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.5456da6512d0aa9a7f27efc983555eda5280accfc3dbab64be95086e2eeaea53/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.fdc273713250725a8bcf3add5ec6161ff7b7d504eb30febdc27a0520c891b329/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/ccx-x86_64/mdevd.environment b/variants/ccx-x86_64/mdevd.environment
@@ -1,51 +1,51 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-dosfstools.09e8c07fe43511248b8e976df0a7f09e90cf353cd235baf3d3a207aca132a158
-#+busybox-e2fsprogs.98e6a090002a1b2834f2ddd71211f52b662e414006a8c520b4596552a894c777
-#+busybox-iproute2.b46f4e1870a13357c575b5e48db34ba7f98e48b7a838ae7027983202a841edc6
-#+busybox-iputils.af9643b60639844e67e066519c692023160e3f94962f86e8e00799e341371acb
-#+busybox-net-misc.7c1a2a37d675a3930447230c1b052ae893e07b3d47b463382d2323e9655ea91e
-#+busybox-net-tools.c0927850259a3cef38d03ef44fd5a6caefa280c1e74f3bbe160c8ce359c022d9
-#+busybox-traceroute.2f574f2b25afda19655180dc3711feac3951774f3103e52f92e0372a9b94da66
-#+busybox-wget.43ecada93e7662300d0da3f4bb0f290c38b1769e75103707fcf92d696e4489e2
-#+busybox-chpst.1c1d5088326b9e97edd30dd2bdd438119ea24e12fccf40f9b2471161ce873fb1
-#+busybox-console.3ea8a865657409661d0601333c1f5d8bd79b9882c6af044814db4f50a8525188
-#+busybox-getty.a66d68cf25da8fac3cf8b1bed75b80300b967eec6a347ebdbabc5d824282adfe
-#+busybox-i2c-tools.bdde4180b4913462c43e44dd6fb39bcee3fc259dae690b95faccb7f3a24276a7
-#+busybox-linux-extra.a4208dfef25dc347b43cce38b89e7c00dd39acf339ebc78fb8e82cc887a89a6e
-#+busybox-mtd-utils.02263cef188489ba3db0ee5d07168a92aa8c4e4664785890ec00b1be7de633ff
-#+busybox-shadow.ba5c90664e648aa730a9f4c133a272f31bdd0b2807efaea6e44b960506049214
-#+busybox-su.972ae119d66a49ca52b33a4ab46cc5c9c5aa3db857e132e3f6ad7a9329010dc2
-#+busybox-util-linux-priv.83fd134d100cc6ab7c12f10afd0a51e9be28be7335dc2beea1ee01c722822a6f
-#+busybox-logging.9991dbce9a635e00954425a5aa899d8aa6b68e566bf000118502542f301af8b3
-#+busybox-cron.a059ab9c97b239a9d0a27f246a09d7ed31238e45bf21c754474a1034cf20ad6f
-#+execline.b87277dfe0acb94786dab9a874a9d2ad37b5db424de8e17e6e363fef332b6766
-#+s6.d963ad9ca000b880b0cf6e44b9207bdfe338fae5c5ef132c623413d38ba3ba83
-#+mdev-scripts.67b06dc1ca0eec5aa4cf6ef39349390ef4d7510a1708aa5cd4f43f0e141d116a
-#+mdevd.930127dac6eecae899be404cbcc311aa2247c3427ade9c4bb1111a4fc5d3d1de
-#+busybox.99f3c7039a4e6f368584f7093c5fe92fd8a05b3bd5ac548201e5f51dad078436-
\ No newline at end of file
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-dosfstools.074e7ac6f86295033f8599b74fa9df92b291baba4fd3b5bc0aca4067a247c873
+#+busybox-e2fsprogs.9291576bf241ac2a8136b1515f10bc38b7b8ed74101a97a8b7f6d8743c742f91
+#+busybox-iproute2.93067047ba7dd262538a7fafb3e0f0efdde7e9f89199a5d19d9c485cc080d73a
+#+busybox-iputils.51a82d350eea617752239f5398df3c4c2951fb8634a69596d9951321065a8abb
+#+busybox-net-misc.90b1234bbbad66e9538e49e8a9c7630542e8d1895872db1c478ca1f942a8ae1c
+#+busybox-net-tools.2e0c91ab8dcd470a4a7e5e770705144478e56c31972b69bfd3475690a01f8f81
+#+busybox-traceroute.21e3cbe48767842789944452d0997a705e6035eb5ec42eb41263e5e7b60a8ed1
+#+busybox-wget.e647ed31cec5707850c15bdf123a066d5800966761038897f1ed6c56d908a1a2
+#+busybox-chpst.dc07b73f710cbad446343fa09a8fef8ee8184ac50e6e82cf4afaff4353dcdd2e
+#+busybox-console.1034e05c2f70346f2e9c847603dbf9e3be37fc759d5cc4522addb0d05477e4a0
+#+busybox-getty.1d5ad8b877058aded48b7e4e4886c31ae813a6fe61b1d3f3357b151cb5d71d48
+#+busybox-i2c-tools.30f44eff3ba62b1fe0e6862a058aae3046326e985e1b15deed8a1286d2d8676f
+#+busybox-linux-extra.888e992de26923278c987256e857716d04af400741b65e70235e45999d091536
+#+busybox-mtd-utils.6adb145c1a674e9bd17f9fbb8de2685d012aba46328a0f4e4be87cf2190ac570
+#+busybox-shadow.be5c1f3eab07d1d2d08d160e334d4aa8d77ee9eebd0af5214a22e07fc9b4f547
+#+busybox-su.f7e8c4a880fc2f2c9efc603227ef3643f5f2560310299b4dd5182501be0758ff
+#+busybox-util-linux-priv.5377559d96ce4229535cd0605dc511e76ffe95c56a87c7df4021ebbb039fb805
+#+busybox-logging.ca771c2979623accaa0452dad1c9494699f646f4a9ccd865969a57ba49bb9da9
+#+busybox-cron.8d0c19a36baeffdb7b3da8488569af29cfc9e0f1a207a8460cdfee21616c3f18
+#+execline.5f80fdb7ce341ec75727ca2fd6170200fceef77821d4dd3e9e55a4b6bc7607d9
+#+s6.34c09d31d26075ada62b33cf0d7269415af83e8dd45a5ce28121cc55cac022c4
+#+mdev-scripts.86e8e75881bb29169f7473125e2d4b134c145de8f7a4f39898ac58723eac1de5
+#+mdevd.2719882ff534bd8b3b9846c2bc0d053a8d5119fd96c6eef352c057aee98ae4ee
+#+busybox.d06ba44874e4589df604d8bbac67dc5ef215b396ec062e788bdaaa7a879f8c23+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/mlog b/variants/ccx-x86_64/mlog
@@ -1,36 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
 #@git:fefc95731f1260810a3551226b73d35f3d6e9d9e:mlog
 
 
diff --git a/variants/ccx-x86_64/musl-fts b/variants/ccx-x86_64/musl-fts
@@ -1,36 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
 #@untar:-z:sha256:49ae567a96dbab22823d045ffebe0d6b14b9b799925e9ca9274d47d26ff482a6:.
 
 
diff --git a/variants/ccx-x86_64/nawk b/variants/ccx-x86_64/nawk
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+bison.9513e3c994e065861ffc9797e92e157593a5202399f921e98631feea7384e043
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+bison.e42f39799b230f40fb038648ddbe5a5e205dec95a78c7afe4f442a23209419d7
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
 #@untar:-z:sha256:e031b1e1d2b230f276f975bffb923f0ea15f798c839d15a3f26a1a39448e32d7:.
 
 
diff --git a/variants/ccx-x86_64/netbsd-curses b/variants/ccx-x86_64/netbsd-curses
@@ -1,36 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
 #@git:51d179dad861640caeb76674b5908ccd79f04fae:netbsd-curses
 
 
diff --git a/variants/ccx-x86_64/nvi b/variants/ccx-x86_64/nvi
@@ -1,39 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+m4.0c844229567ffdfcd436bc4d8ac5e6a19154427bccc49379b4f855b1ed3ce7e1
-#+netbsd-curses.cb67e95c4d3ed170ad040e72827821a371ca90f6f9720876f485535f371fdcbf
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+m4.3353c8ccf091da3cfebd3dae109d466a1467afb4d8a762db92a1e57b3bb70b1c
+#+netbsd-curses.9cdfd594c82da0452baa35a833e0b7ea5c740ba312d4a56a32855c7ee75435a6
 #@untar:-z:sha256:755b87aa1e25c24c4c1668de5573d7d9a327b529423ce3ad9ee753bfb2296e33:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-astring b/variants/ccx-x86_64/ocaml-astring
@@ -1,41 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.e3c8672dadbaeb14c201cef0a00695fec44f9784417436ed35424e8578b74dc9
-#+ocaml-findlib.e66c7eadc4b2274b169a5f82b3357ea04c9b7745b201362ed14a3b7da2f43e56
-#+ocamlbuild.909e1a629122b15b8ec88166296bc90dc4c974e7dac24ab8c6d4555d6d7eab26
-#+opam.4b9cd86320dd3881e67c0dc494de234ba95d3e4ede0ce8f347be35b6cb79516b
-#+ocaml-topkg.d8764e4fcf5e20138d17b01b830b8c18e21eb6d5d4811822722d7ebe14d386fa
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+ocaml.5a0165a7d62a965c81cfa8d090daacabc439612221de6a5a12d0d53c30b3a5ab
+#+ocaml-findlib.4e4728b9e2bf1f77552880ad8c270c15b971312708c28bc784da3ce8ed855315
+#+ocamlbuild.6efffd1d355be6e83f27a725705af7dceef05a75e786023d3c00051b48580636
+#+opam.4822564db13f9d197c5c24ffdce24c7a93415d88a9809a56aac78ea035c8220c
+#+ocaml-topkg.f3f65d720b6ad2a1fd2688b815f8e435919350c7ccd277efa1b173691b8768ed
 #@untar:-j:sha256:865692630c07c3ab87c66cdfc2734c0fdfc9c34a57f8e89ffec7c7d15e7a70fa:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-base b/variants/ccx-x86_64/ocaml-base
@@ -1,40 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.e3c8672dadbaeb14c201cef0a00695fec44f9784417436ed35424e8578b74dc9
-#+dune.2059aabf85d5e724bc0bbe45cd6a1ea4f8d11189c7ccacc91811607aed23c38e
-#+ocaml_intrinsics_kernel.8dcdde68dc41ab938b48b281de8e2a2f1274d7cc46f1a3c9caf2ced12913cd29
-#+ocaml-sexplib0.47cea707f7584d84ee157990524c50ef52738769f2397c0bcf3041ac8d0bb95f
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+ocaml.5a0165a7d62a965c81cfa8d090daacabc439612221de6a5a12d0d53c30b3a5ab
+#+dune.f59ceab0af6b7c34ed9cf22594e1e500dd345d8b9b549cbceb3d160388aa77c5
+#+ocaml_intrinsics_kernel.6d8df7bc4c0991ef521006c1c196dea67e0b4b3a15e9b0696abf3acbbcf84e04
+#+ocaml-sexplib0.3a6c75d6d0e06c481a5c7eb8cbdec337a3bb430a4c45e7bc023a29a787d0edf7
 #@untar:-z:sha256:3f3f64789ab25bb5cb7f5f907dd651dec9cc9440981822fe75df6b94344b7208:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-bos b/variants/ccx-x86_64/ocaml-bos
@@ -1,47 +1,45 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.e3c8672dadbaeb14c201cef0a00695fec44f9784417436ed35424e8578b74dc9
-#+ocaml-findlib.e66c7eadc4b2274b169a5f82b3357ea04c9b7745b201362ed14a3b7da2f43e56
-#+ocamlbuild.909e1a629122b15b8ec88166296bc90dc4c974e7dac24ab8c6d4555d6d7eab26
-#+opam.4b9cd86320dd3881e67c0dc494de234ba95d3e4ede0ce8f347be35b6cb79516b
-#+ocaml-topkg.d8764e4fcf5e20138d17b01b830b8c18e21eb6d5d4811822722d7ebe14d386fa
-#+ocaml-astring.88c5ca2ccdb8e8d532cf85c1b14bfaaac0e1e24aa99163768a189a0ae3a9ab80
-#+ocaml-fpath.dce6ff7a1fa53ae16a89e859d063a6278c37051c6a86057fc893bce1afe22cfb
-#+ocaml-rresult.370487d85f9da4d38a9c87f97d5639a2625ad80b277127dd7d8756fd10621857
-#+ocaml-fmt.e7a283567d0de8f007f5b40ba9ba3343534653886b91a013e170444ff801c31d
-#+ocaml-logs.09cb9dceca7dd9b897066f083cb0e4753df14e7e474ab7a25824e2211a4af8e9
-#+ocaml-mtime.d5ba58c287abe2f92242ca9a60d17b80b8855cdd88b8d62105b854f7333e859d
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+ocaml.5a0165a7d62a965c81cfa8d090daacabc439612221de6a5a12d0d53c30b3a5ab
+#+ocaml-findlib.4e4728b9e2bf1f77552880ad8c270c15b971312708c28bc784da3ce8ed855315
+#+ocamlbuild.6efffd1d355be6e83f27a725705af7dceef05a75e786023d3c00051b48580636
+#+opam.4822564db13f9d197c5c24ffdce24c7a93415d88a9809a56aac78ea035c8220c
+#+ocaml-topkg.f3f65d720b6ad2a1fd2688b815f8e435919350c7ccd277efa1b173691b8768ed
+#+ocaml-astring.6ebcda234417adc3c5f444eb9104c72c705bb6d8b7d3aafb18671af97d38ff7b
+#+ocaml-fpath.9c07ce2196a98c270384cb5cc83a460ba6161fe41f9162ed4c8f3db93e668f0f
+#+ocaml-rresult.87940b6c96f2447ec36ea81ed91a76e40f36dcf26545d5a98758eb0ab160b5fd
+#+ocaml-fmt.76778da6efb17d7dc7532c3bd4680bb625985a746b5f382904b31ee368e9683f
+#+ocaml-logs.fb371b084885e67e5ab17bd0f240eaf810464b9e7c2ef8fb5d16b390a940b8db
+#+ocaml-mtime.661e4d0c180b4882ac6579cc4f185c904aace0cc73dac08324b1033e24c5e97e
 #@untar:-j:sha256:d8d62e786b10d697e0457205a8eedeaa27ebcc90f1855f18df190cac2e3d8f37:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-cmdliner b/variants/ccx-x86_64/ocaml-cmdliner
@@ -1,41 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.e3c8672dadbaeb14c201cef0a00695fec44f9784417436ed35424e8578b74dc9
-#+ocaml-findlib.e66c7eadc4b2274b169a5f82b3357ea04c9b7745b201362ed14a3b7da2f43e56
-#+ocamlbuild.909e1a629122b15b8ec88166296bc90dc4c974e7dac24ab8c6d4555d6d7eab26
-#+opam.4b9cd86320dd3881e67c0dc494de234ba95d3e4ede0ce8f347be35b6cb79516b
-#+ocaml-topkg.d8764e4fcf5e20138d17b01b830b8c18e21eb6d5d4811822722d7ebe14d386fa
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+ocaml.5a0165a7d62a965c81cfa8d090daacabc439612221de6a5a12d0d53c30b3a5ab
+#+ocaml-findlib.4e4728b9e2bf1f77552880ad8c270c15b971312708c28bc784da3ce8ed855315
+#+ocamlbuild.6efffd1d355be6e83f27a725705af7dceef05a75e786023d3c00051b48580636
+#+opam.4822564db13f9d197c5c24ffdce24c7a93415d88a9809a56aac78ea035c8220c
+#+ocaml-topkg.f3f65d720b6ad2a1fd2688b815f8e435919350c7ccd277efa1b173691b8768ed
 #@untar:-j:sha256:4e547a631c36fbaadff60d3bd7724eb3f83ba274e92fb725950bae7868378582:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-compiler-libs b/variants/ccx-x86_64/ocaml-compiler-libs
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.e3c8672dadbaeb14c201cef0a00695fec44f9784417436ed35424e8578b74dc9
-#+dune.2059aabf85d5e724bc0bbe45cd6a1ea4f8d11189c7ccacc91811607aed23c38e
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+ocaml.5a0165a7d62a965c81cfa8d090daacabc439612221de6a5a12d0d53c30b3a5ab
+#+dune.f59ceab0af6b7c34ed9cf22594e1e500dd345d8b9b549cbceb3d160388aa77c5
 #@untar:-z:sha256:9b9644d7351db699e57ddba7c767bb4153e6e988ccf45ead2fb238a3bd75cdc7:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-cppo b/variants/ccx-x86_64/ocaml-cppo
@@ -1,39 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.e3c8672dadbaeb14c201cef0a00695fec44f9784417436ed35424e8578b74dc9
-#+dune.2059aabf85d5e724bc0bbe45cd6a1ea4f8d11189c7ccacc91811607aed23c38e
-#+ocamlbuild.909e1a629122b15b8ec88166296bc90dc4c974e7dac24ab8c6d4555d6d7eab26
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+ocaml.5a0165a7d62a965c81cfa8d090daacabc439612221de6a5a12d0d53c30b3a5ab
+#+dune.f59ceab0af6b7c34ed9cf22594e1e500dd345d8b9b549cbceb3d160388aa77c5
+#+ocamlbuild.6efffd1d355be6e83f27a725705af7dceef05a75e786023d3c00051b48580636
 #@untar:-z:sha256:6e62a8ee0217c9cc38d5860110eb18eb8d89c05c420353d298e1431fe8bac00f:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-findlib b/variants/ccx-x86_64/ocaml-findlib
@@ -1,41 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+m4.0c844229567ffdfcd436bc4d8ac5e6a19154427bccc49379b4f855b1ed3ce7e1
-#+netbsd-curses.cb67e95c4d3ed170ad040e72827821a371ca90f6f9720876f485535f371fdcbf
-#+ocaml.e3c8672dadbaeb14c201cef0a00695fec44f9784417436ed35424e8578b74dc9
-#+ocamlbuild.909e1a629122b15b8ec88166296bc90dc4c974e7dac24ab8c6d4555d6d7eab26
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+m4.3353c8ccf091da3cfebd3dae109d466a1467afb4d8a762db92a1e57b3bb70b1c
+#+netbsd-curses.9cdfd594c82da0452baa35a833e0b7ea5c740ba312d4a56a32855c7ee75435a6
+#+ocaml.5a0165a7d62a965c81cfa8d090daacabc439612221de6a5a12d0d53c30b3a5ab
+#+ocamlbuild.6efffd1d355be6e83f27a725705af7dceef05a75e786023d3c00051b48580636
 #@untar:-z:sha256:662c910f774e9fee3a19c4e057f380581ab2fc4ee52da4761304ac9c31b8869d:.
 
 
@@ -81,7 +79,7 @@ cd 'findlib-1.9.8'
 make -j1 all opt
 
 # workaround `topfind` getting installed to stdlib directory, this is not configurable
-stdlib="$pthbs_destdir/home/ccx/versions/ocaml.e3c8672dadbaeb14c201cef0a00695fec44f9784417436ed35424e8578b74dc9"
+stdlib="$pthbs_destdir/home/ccx/versions/ocaml.5a0165a7d62a965c81cfa8d090daacabc439612221de6a5a12d0d53c30b3a5ab"
 mkdir -p "${stdlib%/*}"
 ln -s "$pthbs_package" "$stdlib"
 make install prefix="$pthbs_destdir"
diff --git a/variants/ccx-x86_64/ocaml-fmt b/variants/ccx-x86_64/ocaml-fmt
@@ -1,42 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.e3c8672dadbaeb14c201cef0a00695fec44f9784417436ed35424e8578b74dc9
-#+ocaml-findlib.e66c7eadc4b2274b169a5f82b3357ea04c9b7745b201362ed14a3b7da2f43e56
-#+ocamlbuild.909e1a629122b15b8ec88166296bc90dc4c974e7dac24ab8c6d4555d6d7eab26
-#+opam.4b9cd86320dd3881e67c0dc494de234ba95d3e4ede0ce8f347be35b6cb79516b
-#+ocaml-topkg.d8764e4fcf5e20138d17b01b830b8c18e21eb6d5d4811822722d7ebe14d386fa
-#+ocaml-cmdliner.82ca465a7caddcbc5768b37519765634d01920facde5ad3d348efecbb2c92a93
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+ocaml.5a0165a7d62a965c81cfa8d090daacabc439612221de6a5a12d0d53c30b3a5ab
+#+ocaml-findlib.4e4728b9e2bf1f77552880ad8c270c15b971312708c28bc784da3ce8ed855315
+#+ocamlbuild.6efffd1d355be6e83f27a725705af7dceef05a75e786023d3c00051b48580636
+#+opam.4822564db13f9d197c5c24ffdce24c7a93415d88a9809a56aac78ea035c8220c
+#+ocaml-topkg.f3f65d720b6ad2a1fd2688b815f8e435919350c7ccd277efa1b173691b8768ed
+#+ocaml-cmdliner.5e4ae0bf1840e7624e03aaebe9a6c7e528784940fc5ad3c37ea088bd9ba1fac0
 #@untar:-j:sha256:857cfd47a54b52429cd9b3e2665e44173cd1bd3b435bece7172f984ad5376a1b:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-fpath b/variants/ccx-x86_64/ocaml-fpath
@@ -1,42 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.e3c8672dadbaeb14c201cef0a00695fec44f9784417436ed35424e8578b74dc9
-#+ocaml-findlib.e66c7eadc4b2274b169a5f82b3357ea04c9b7745b201362ed14a3b7da2f43e56
-#+ocamlbuild.909e1a629122b15b8ec88166296bc90dc4c974e7dac24ab8c6d4555d6d7eab26
-#+opam.4b9cd86320dd3881e67c0dc494de234ba95d3e4ede0ce8f347be35b6cb79516b
-#+ocaml-topkg.d8764e4fcf5e20138d17b01b830b8c18e21eb6d5d4811822722d7ebe14d386fa
-#+ocaml-astring.88c5ca2ccdb8e8d532cf85c1b14bfaaac0e1e24aa99163768a189a0ae3a9ab80
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+ocaml.5a0165a7d62a965c81cfa8d090daacabc439612221de6a5a12d0d53c30b3a5ab
+#+ocaml-findlib.4e4728b9e2bf1f77552880ad8c270c15b971312708c28bc784da3ce8ed855315
+#+ocamlbuild.6efffd1d355be6e83f27a725705af7dceef05a75e786023d3c00051b48580636
+#+opam.4822564db13f9d197c5c24ffdce24c7a93415d88a9809a56aac78ea035c8220c
+#+ocaml-topkg.f3f65d720b6ad2a1fd2688b815f8e435919350c7ccd277efa1b173691b8768ed
+#+ocaml-astring.6ebcda234417adc3c5f444eb9104c72c705bb6d8b7d3aafb18671af97d38ff7b
 #@untar:-j:sha256:12b08ff192d037d9b6d69e9ca19d1d385184f20b3237c27231e437ac81ace70f:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-logs b/variants/ccx-x86_64/ocaml-logs
@@ -1,44 +1,42 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.e3c8672dadbaeb14c201cef0a00695fec44f9784417436ed35424e8578b74dc9
-#+ocaml-findlib.e66c7eadc4b2274b169a5f82b3357ea04c9b7745b201362ed14a3b7da2f43e56
-#+ocamlbuild.909e1a629122b15b8ec88166296bc90dc4c974e7dac24ab8c6d4555d6d7eab26
-#+opam.4b9cd86320dd3881e67c0dc494de234ba95d3e4ede0ce8f347be35b6cb79516b
-#+ocaml-topkg.d8764e4fcf5e20138d17b01b830b8c18e21eb6d5d4811822722d7ebe14d386fa
-#+ocaml-mtime.d5ba58c287abe2f92242ca9a60d17b80b8855cdd88b8d62105b854f7333e859d
-#+ocaml-cmdliner.82ca465a7caddcbc5768b37519765634d01920facde5ad3d348efecbb2c92a93
-#+ocaml-fmt.e7a283567d0de8f007f5b40ba9ba3343534653886b91a013e170444ff801c31d
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+ocaml.5a0165a7d62a965c81cfa8d090daacabc439612221de6a5a12d0d53c30b3a5ab
+#+ocaml-findlib.4e4728b9e2bf1f77552880ad8c270c15b971312708c28bc784da3ce8ed855315
+#+ocamlbuild.6efffd1d355be6e83f27a725705af7dceef05a75e786023d3c00051b48580636
+#+opam.4822564db13f9d197c5c24ffdce24c7a93415d88a9809a56aac78ea035c8220c
+#+ocaml-topkg.f3f65d720b6ad2a1fd2688b815f8e435919350c7ccd277efa1b173691b8768ed
+#+ocaml-mtime.661e4d0c180b4882ac6579cc4f185c904aace0cc73dac08324b1033e24c5e97e
+#+ocaml-cmdliner.5e4ae0bf1840e7624e03aaebe9a6c7e528784940fc5ad3c37ea088bd9ba1fac0
+#+ocaml-fmt.76778da6efb17d7dc7532c3bd4680bb625985a746b5f382904b31ee368e9683f
 #@untar:-j:sha256:ee97065ba41ce28f19dea9453c6bec4e0ef26165ad7394c4131ea0c65c0f06d5:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-lun b/variants/ccx-x86_64/ocaml-lun
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.e3c8672dadbaeb14c201cef0a00695fec44f9784417436ed35424e8578b74dc9
-#+dune.2059aabf85d5e724bc0bbe45cd6a1ea4f8d11189c7ccacc91811607aed23c38e
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+ocaml.5a0165a7d62a965c81cfa8d090daacabc439612221de6a5a12d0d53c30b3a5ab
+#+dune.f59ceab0af6b7c34ed9cf22594e1e500dd345d8b9b549cbceb3d160388aa77c5
 #@untar:-j:sha256:cca8badff83b470fdcfb1840116f8e8a6f2cb86cde2f44ed28cf26cbf692a793:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-mtime b/variants/ccx-x86_64/ocaml-mtime
@@ -1,41 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.e3c8672dadbaeb14c201cef0a00695fec44f9784417436ed35424e8578b74dc9
-#+ocaml-findlib.e66c7eadc4b2274b169a5f82b3357ea04c9b7745b201362ed14a3b7da2f43e56
-#+ocamlbuild.909e1a629122b15b8ec88166296bc90dc4c974e7dac24ab8c6d4555d6d7eab26
-#+opam.4b9cd86320dd3881e67c0dc494de234ba95d3e4ede0ce8f347be35b6cb79516b
-#+ocaml-topkg.d8764e4fcf5e20138d17b01b830b8c18e21eb6d5d4811822722d7ebe14d386fa
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+ocaml.5a0165a7d62a965c81cfa8d090daacabc439612221de6a5a12d0d53c30b3a5ab
+#+ocaml-findlib.4e4728b9e2bf1f77552880ad8c270c15b971312708c28bc784da3ce8ed855315
+#+ocamlbuild.6efffd1d355be6e83f27a725705af7dceef05a75e786023d3c00051b48580636
+#+opam.4822564db13f9d197c5c24ffdce24c7a93415d88a9809a56aac78ea035c8220c
+#+ocaml-topkg.f3f65d720b6ad2a1fd2688b815f8e435919350c7ccd277efa1b173691b8768ed
 #@untar:-j:sha256:097cb2802e3701ead9572e1b483d5a28c6e2f0a39449faaf9b44ad8a89834d88:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-ppx_derivers b/variants/ccx-x86_64/ocaml-ppx_derivers
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.e3c8672dadbaeb14c201cef0a00695fec44f9784417436ed35424e8578b74dc9
-#+dune.2059aabf85d5e724bc0bbe45cd6a1ea4f8d11189c7ccacc91811607aed23c38e
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+ocaml.5a0165a7d62a965c81cfa8d090daacabc439612221de6a5a12d0d53c30b3a5ab
+#+dune.f59ceab0af6b7c34ed9cf22594e1e500dd345d8b9b549cbceb3d160388aa77c5
 #@untar:-z:sha256:b6595ee187dea792b31fc54a0e1524ab1e48bc6068d3066c45215a138cc73b95:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-ppx_deriving b/variants/ccx-x86_64/ocaml-ppx_deriving
@@ -1,45 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.e3c8672dadbaeb14c201cef0a00695fec44f9784417436ed35424e8578b74dc9
-#+dune.2059aabf85d5e724bc0bbe45cd6a1ea4f8d11189c7ccacc91811607aed23c38e
-#+ocaml-compiler-libs.fe6d57ad05e1d988716f271bbec4bb7b1cc813b542fcc1f4350d16edcb2e1fb3
-#+ocaml-cppo.510b889e26bf723ad65020e3fdeae25a3fd9580c1b1a7ef49c83879b9bc371a2
-#+ocaml-findlib.e66c7eadc4b2274b169a5f82b3357ea04c9b7745b201362ed14a3b7da2f43e56
-#+ocaml-ppx_derivers.549ac7e43af465d966f62d7faf67049afe1edf6abcd950d18757e83ad889b233
-#+ocaml-ppxlib.b4af739f62aa28c5c6233e0445ba459997e760f3e1ff95075bfe7442efebebea
-#+ocaml-sexplib0.47cea707f7584d84ee157990524c50ef52738769f2397c0bcf3041ac8d0bb95f
-#+ocaml-stdlib-shims.92e3776029dd14facca057d36abde234ac3fe5e5158b1e7868266faaf404c249
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+ocaml.5a0165a7d62a965c81cfa8d090daacabc439612221de6a5a12d0d53c30b3a5ab
+#+dune.f59ceab0af6b7c34ed9cf22594e1e500dd345d8b9b549cbceb3d160388aa77c5
+#+ocaml-compiler-libs.fe713de58ea0922d08824d87415b679a063b1d33a919e874b8c7b291f13cbdc6
+#+ocaml-cppo.cbf47ff32f7c99f149eeef3c14c711c270b97b6635908beef0c90c2b5470c7aa
+#+ocaml-findlib.4e4728b9e2bf1f77552880ad8c270c15b971312708c28bc784da3ce8ed855315
+#+ocaml-ppx_derivers.7ac287ba2608147026e291c9387badc9b940236bdabf454f47524132b2b3e306
+#+ocaml-ppxlib.5ba6b5069a5a85628b78603d4ada5dd1c796c832791df5298e343627c4386afa
+#+ocaml-sexplib0.3a6c75d6d0e06c481a5c7eb8cbdec337a3bb430a4c45e7bc023a29a787d0edf7
+#+ocaml-stdlib-shims.957449a25872d2ea9a6b8d572f7ee1b5e32ac1230dd767cedf6d2fced3dd03ec
 #@untar:-z:sha256:c91d1ea5e15e6928a2f8947dbd135b9f765cc0e2d72be271427981afcd350c24:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-ppxlib b/variants/ccx-x86_64/ocaml-ppxlib
@@ -1,42 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.e3c8672dadbaeb14c201cef0a00695fec44f9784417436ed35424e8578b74dc9
-#+dune.2059aabf85d5e724bc0bbe45cd6a1ea4f8d11189c7ccacc91811607aed23c38e
-#+ocaml-compiler-libs.fe6d57ad05e1d988716f271bbec4bb7b1cc813b542fcc1f4350d16edcb2e1fb3
-#+ocaml-ppx_derivers.549ac7e43af465d966f62d7faf67049afe1edf6abcd950d18757e83ad889b233
-#+ocaml-sexplib0.47cea707f7584d84ee157990524c50ef52738769f2397c0bcf3041ac8d0bb95f
-#+ocaml-stdlib-shims.92e3776029dd14facca057d36abde234ac3fe5e5158b1e7868266faaf404c249
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+ocaml.5a0165a7d62a965c81cfa8d090daacabc439612221de6a5a12d0d53c30b3a5ab
+#+dune.f59ceab0af6b7c34ed9cf22594e1e500dd345d8b9b549cbceb3d160388aa77c5
+#+ocaml-compiler-libs.fe713de58ea0922d08824d87415b679a063b1d33a919e874b8c7b291f13cbdc6
+#+ocaml-ppx_derivers.7ac287ba2608147026e291c9387badc9b940236bdabf454f47524132b2b3e306
+#+ocaml-sexplib0.3a6c75d6d0e06c481a5c7eb8cbdec337a3bb430a4c45e7bc023a29a787d0edf7
+#+ocaml-stdlib-shims.957449a25872d2ea9a6b8d572f7ee1b5e32ac1230dd767cedf6d2fced3dd03ec
 #@untar:-j:sha256:2e223837e7cecc3bc84a432432c0a72f4e1d5be9165c9c33772f156db85db0b3:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-rresult b/variants/ccx-x86_64/ocaml-rresult
@@ -1,41 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.e3c8672dadbaeb14c201cef0a00695fec44f9784417436ed35424e8578b74dc9
-#+ocaml-findlib.e66c7eadc4b2274b169a5f82b3357ea04c9b7745b201362ed14a3b7da2f43e56
-#+ocamlbuild.909e1a629122b15b8ec88166296bc90dc4c974e7dac24ab8c6d4555d6d7eab26
-#+opam.4b9cd86320dd3881e67c0dc494de234ba95d3e4ede0ce8f347be35b6cb79516b
-#+ocaml-topkg.d8764e4fcf5e20138d17b01b830b8c18e21eb6d5d4811822722d7ebe14d386fa
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+ocaml.5a0165a7d62a965c81cfa8d090daacabc439612221de6a5a12d0d53c30b3a5ab
+#+ocaml-findlib.4e4728b9e2bf1f77552880ad8c270c15b971312708c28bc784da3ce8ed855315
+#+ocamlbuild.6efffd1d355be6e83f27a725705af7dceef05a75e786023d3c00051b48580636
+#+opam.4822564db13f9d197c5c24ffdce24c7a93415d88a9809a56aac78ea035c8220c
+#+ocaml-topkg.f3f65d720b6ad2a1fd2688b815f8e435919350c7ccd277efa1b173691b8768ed
 #@untar:-j:sha256:11aa7f5b83460e60431e3154e3e32c071d46e151ea5760cf24377805bf975540:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-sexplib0 b/variants/ccx-x86_64/ocaml-sexplib0
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.e3c8672dadbaeb14c201cef0a00695fec44f9784417436ed35424e8578b74dc9
-#+dune.2059aabf85d5e724bc0bbe45cd6a1ea4f8d11189c7ccacc91811607aed23c38e
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+ocaml.5a0165a7d62a965c81cfa8d090daacabc439612221de6a5a12d0d53c30b3a5ab
+#+dune.f59ceab0af6b7c34ed9cf22594e1e500dd345d8b9b549cbceb3d160388aa77c5
 #@untar:-z:sha256:86dba26468194512f789f2fb709063515a9cb4e5c4461c021c239a369590701d:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-stdlib-shims b/variants/ccx-x86_64/ocaml-stdlib-shims
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.e3c8672dadbaeb14c201cef0a00695fec44f9784417436ed35424e8578b74dc9
-#+dune.2059aabf85d5e724bc0bbe45cd6a1ea4f8d11189c7ccacc91811607aed23c38e
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+ocaml.5a0165a7d62a965c81cfa8d090daacabc439612221de6a5a12d0d53c30b3a5ab
+#+dune.f59ceab0af6b7c34ed9cf22594e1e500dd345d8b9b549cbceb3d160388aa77c5
 #@untar:-j:sha256:babf72d3917b86f707885f0c5528e36c63fccb698f4b46cf2bab5c7ccdd6d84a:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-topkg b/variants/ccx-x86_64/ocaml-topkg
@@ -1,40 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.e3c8672dadbaeb14c201cef0a00695fec44f9784417436ed35424e8578b74dc9
-#+ocaml-findlib.e66c7eadc4b2274b169a5f82b3357ea04c9b7745b201362ed14a3b7da2f43e56
-#+ocamlbuild.909e1a629122b15b8ec88166296bc90dc4c974e7dac24ab8c6d4555d6d7eab26
-#+opam.4b9cd86320dd3881e67c0dc494de234ba95d3e4ede0ce8f347be35b6cb79516b
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+ocaml.5a0165a7d62a965c81cfa8d090daacabc439612221de6a5a12d0d53c30b3a5ab
+#+ocaml-findlib.4e4728b9e2bf1f77552880ad8c270c15b971312708c28bc784da3ce8ed855315
+#+ocamlbuild.6efffd1d355be6e83f27a725705af7dceef05a75e786023d3c00051b48580636
+#+opam.4822564db13f9d197c5c24ffdce24c7a93415d88a9809a56aac78ea035c8220c
 #@untar:-j:sha256:452082626e651ac4b1633c2b4ae4cad7abeb1fb6a13046e699f95eec58b5d1c7:.
 
 
diff --git a/variants/ccx-x86_64/ocaml.environment b/variants/ccx-x86_64/ocaml.environment
@@ -1,9 +1,9 @@
 #!/usr/bin/env pthbs-build
-#+ocaml.e3c8672dadbaeb14c201cef0a00695fec44f9784417436ed35424e8578b74dc9
-#+dune.2059aabf85d5e724bc0bbe45cd6a1ea4f8d11189c7ccacc91811607aed23c38e
-#+ocamlbuild.909e1a629122b15b8ec88166296bc90dc4c974e7dac24ab8c6d4555d6d7eab26
-#+ocaml-base.70aae180ffc939c39cf689806eda6835d752a002e14c7e8bc2bb38fda72a5b30
-#+opam.4b9cd86320dd3881e67c0dc494de234ba95d3e4ede0ce8f347be35b6cb79516b
-#+ocaml-bos.4184b2f1dbb421e66f2c20e3235a74adc9d7c8afbb74a214453ec40eedba6a74
-#+ocaml-lun.150c6b296a478fc8c83981e2bf1c19dfc517cb3937a3b472e2376432a6ad9e35
-#+ocaml-ppx_deriving.7efcb2097a74d34459891435120953fce8b69995fa63e571bd669efe43c2bb0c-
\ No newline at end of file
+#+ocaml.5a0165a7d62a965c81cfa8d090daacabc439612221de6a5a12d0d53c30b3a5ab
+#+dune.f59ceab0af6b7c34ed9cf22594e1e500dd345d8b9b549cbceb3d160388aa77c5
+#+ocamlbuild.6efffd1d355be6e83f27a725705af7dceef05a75e786023d3c00051b48580636
+#+ocaml-base.3e79f793ffe1c39f9ca74ddcf1a422dd6443c10a39d7b932d11d93fe508286d4
+#+opam.4822564db13f9d197c5c24ffdce24c7a93415d88a9809a56aac78ea035c8220c
+#+ocaml-bos.45d2717a1d4b64b752a5882e25712b1c0f75480340d0a27d889a56f0de9da5e2
+#+ocaml-lun.4933ca9ccc737af2dfa9c08e008aa6e074e822d4368df6eb7e260955a427057a
+#+ocaml-ppx_deriving.adb486ec4e854190b66a2ebffb9a7fd8421f554116a6f84f9da70bc7316c2c04+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/ocaml:dynlink b/variants/ccx-x86_64/ocaml:dynlink
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+m4.0c844229567ffdfcd436bc4d8ac5e6a19154427bccc49379b4f855b1ed3ce7e1
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+m4.3353c8ccf091da3cfebd3dae109d466a1467afb4d8a762db92a1e57b3bb70b1c
 #@untar:-J:sha256:dfaa8a2e11c799bc1765d8bef44911406ee5f4803027190382a939f88c912266:.
 
 
diff --git a/variants/ccx-x86_64/ocaml_intrinsics_kernel b/variants/ccx-x86_64/ocaml_intrinsics_kernel
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.e3c8672dadbaeb14c201cef0a00695fec44f9784417436ed35424e8578b74dc9
-#+dune.2059aabf85d5e724bc0bbe45cd6a1ea4f8d11189c7ccacc91811607aed23c38e
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+ocaml.5a0165a7d62a965c81cfa8d090daacabc439612221de6a5a12d0d53c30b3a5ab
+#+dune.f59ceab0af6b7c34ed9cf22594e1e500dd345d8b9b549cbceb3d160388aa77c5
 #@untar:-z:sha256:c988b7769a59749631c3c98ba5edd1d2fe91f5dc380b5e0593c073c92f4bee01:.
 
 
diff --git a/variants/ccx-x86_64/ocamlbuild b/variants/ccx-x86_64/ocamlbuild
@@ -1,39 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+m4.0c844229567ffdfcd436bc4d8ac5e6a19154427bccc49379b4f855b1ed3ce7e1
-#+ocaml.e3c8672dadbaeb14c201cef0a00695fec44f9784417436ed35424e8578b74dc9
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+m4.3353c8ccf091da3cfebd3dae109d466a1467afb4d8a762db92a1e57b3bb70b1c
+#+ocaml.5a0165a7d62a965c81cfa8d090daacabc439612221de6a5a12d0d53c30b3a5ab
 #@untar:-z:sha256:2ba6857f2991b7f69368e8db818b163d31cf5a367f15f5953bf8f01a77b3d4fc:.
 
 
@@ -77,7 +75,7 @@ make configure \
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
 # workaround ocamlbuild manpage getting installed to stdlib directory
-stdlib="$pthbs_destdir/home/ccx/versions/ocaml.e3c8672dadbaeb14c201cef0a00695fec44f9784417436ed35424e8578b74dc9"
+stdlib="$pthbs_destdir/home/ccx/versions/ocaml.5a0165a7d62a965c81cfa8d090daacabc439612221de6a5a12d0d53c30b3a5ab"
 mkdir -p "${stdlib%/*}"
 ln -s "$pthbs_package" "$stdlib"
 
diff --git a/variants/ccx-x86_64/opam b/variants/ccx-x86_64/opam
@@ -1,41 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+diffutils.c3fc24f6c64356a5a4fc6695b9f1348f3530184edd0481de43fc5316b15f6db8
-#+patch.f6b6edfce98acd976b39b2fe2cc9057d7473c71171f6f1789d72a8b122dda60c
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+getconf.9929ee975df8af08a213c7e249a2e66fa0cb2c67ec7042ebcdc366ba41a070c1
-#+ocaml.e3c8672dadbaeb14c201cef0a00695fec44f9784417436ed35424e8578b74dc9
-#+dune.2059aabf85d5e724bc0bbe45cd6a1ea4f8d11189c7ccacc91811607aed23c38e
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+diffutils.3d2e21b2ea04282ac99a7586f7918e4110cff8a7822a8424257e8960144fada0
+#+patch.5272590ddc980d98e6454b3fa5b4ad4cbf1f937c6bbdae97e024e6240b2db58b
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+getconf.fa089cdd2b7841090a50b68454265f05e1fb3b8f314ff9eaee4599d4a78e1d97
+#+ocaml.5a0165a7d62a965c81cfa8d090daacabc439612221de6a5a12d0d53c30b3a5ab
+#+dune.f59ceab0af6b7c34ed9cf22594e1e500dd345d8b9b549cbceb3d160388aa77c5
 #@untar:-z:sha256:c4d053029793c714e4e7340b1157428c0f90783585fb17f35158247a640467d9:.
 
 
@@ -74,7 +72,7 @@ export DUNE_CACHE=disabled
 	--infodir="$prefix/info" \
 	--localedir="$prefix/locale" \
 	--localstatedir='/var/pthbs' \
-	--with-dune='/home/ccx/versions/dune.2059aabf85d5e724bc0bbe45cd6a1ea4f8d11189c7ccacc91811607aed23c38e/command/dune' \
+	--with-dune='/home/ccx/versions/dune.f59ceab0af6b7c34ed9cf22594e1e500dd345d8b9b549cbceb3d160388aa77c5/command/dune' \
 	--with-mccs \
 	--with-vendored-deps \
 	--enable-static
diff --git a/variants/ccx-x86_64/patch b/variants/ccx-x86_64/patch
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+m4.0c844229567ffdfcd436bc4d8ac5e6a19154427bccc49379b4f855b1ed3ce7e1
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+m4.3353c8ccf091da3cfebd3dae109d466a1467afb4d8a762db92a1e57b3bb70b1c
 #@untar:-J:sha256:ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd:.
 
 
diff --git a/variants/ccx-x86_64/pkgconf b/variants/ccx-x86_64/pkgconf
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+m4.0c844229567ffdfcd436bc4d8ac5e6a19154427bccc49379b4f855b1ed3ce7e1
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+m4.3353c8ccf091da3cfebd3dae109d466a1467afb4d8a762db92a1e57b3bb70b1c
 #@untar:-J:sha256:3a224f2accf091b77a5781316e27b9ee3ba82c083cc2e539e08940b68a44fec5:.
 
 
diff --git a/variants/ccx-x86_64/pkgconf-pkg-config b/variants/ccx-x86_64/pkgconf-pkg-config
@@ -1,31 +1,31 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+pkgconf.a214c64b4ded23fd7cba681134ed69645e092c0dcc4f18f3e41d1af2f24527df
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+pkgconf.38c392ec751dd957388b12fe884361cd82901d8872d390b317347298297f1fd4
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/popt b/variants/ccx-x86_64/popt
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+m4.0c844229567ffdfcd436bc4d8ac5e6a19154427bccc49379b4f855b1ed3ce7e1
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+m4.3353c8ccf091da3cfebd3dae109d466a1467afb4d8a762db92a1e57b3bb70b1c
 #@untar:-z:sha256:c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9:.
 
 
diff --git a/variants/ccx-x86_64/pthbs-banginstall b/variants/ccx-x86_64/pthbs-banginstall
@@ -1,33 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+zsh.c9ff605cba8b7ab3cc834a858e600d75365f0d472df7827bc4304e7f2b161713
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+zsh.5e6964dc3be6822ea25475d86d39ce18b171d6d4316ff2479a9848e06875367f
 #@sha256:1e021bddaf5c020ede9107656494715236a894557b99035365fc999605541b2d:pthbs-banginstall
 
 
diff --git a/variants/ccx-x86_64/rsync b/variants/ccx-x86_64/rsync
@@ -1,41 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+m4.0c844229567ffdfcd436bc4d8ac5e6a19154427bccc49379b4f855b1ed3ce7e1
-#+nawk.5f1f4b2334ef21dfe9770754962a16a9d0bedb9795a4a61914d0a4c06423dfdc
-#+popt.4edbc3e4720193ea3643564403247bbcd603c8475e7ef8ba2018d6e3ae8e008b
-#+libressl.5014a45ebeba049f96b1442e3f11880d71f918c4ee444ae78ef1010ee65384c1
-#+zstd.06b8da2f7f8fbd89ec0350960d26c5fcc28a73147508ac97ebd1387dbe0f9b78
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+m4.3353c8ccf091da3cfebd3dae109d466a1467afb4d8a762db92a1e57b3bb70b1c
+#+nawk.0ffb368f1e19d8db634f7c2bcdb4b670f58e1509446bf8d5a4f5243b10a46483
+#+popt.070a7cf04a7fd00eb928c83f29e3e6a8edef4bab757102b0422505e888ce8191
+#+libressl.cd8c8972c5fd319c44b2708144ca27ea42b323dd57d79ba4e631e52bcd30e275
+#+zstd.c03a460188a9d2b637fe5761a111c00b9aec370688e0246cb3d763100991f226
 #@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:.
 
 
diff --git a/variants/ccx-x86_64/s6 b/variants/ccx-x86_64/s6
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+skalibs.5456da6512d0aa9a7f27efc983555eda5280accfc3dbab64be95086e2eeaea53
-#+execline.b87277dfe0acb94786dab9a874a9d2ad37b5db424de8e17e6e363fef332b6766
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+skalibs.fdc273713250725a8bcf3add5ec6161ff7b7d504eb30febdc27a0520c891b329
+#+execline.5f80fdb7ce341ec75727ca2fd6170200fceef77821d4dd3e9e55a4b6bc7607d9
 #@git:0e02fe0e92b8f9a619fc355babad2c78c009c1f1:s6
 
 
@@ -49,7 +47,7 @@ cd 's6'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.5456da6512d0aa9a7f27efc983555eda5280accfc3dbab64be95086e2eeaea53/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.fdc273713250725a8bcf3add5ec6161ff7b7d504eb30febdc27a0520c891b329/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/ccx-x86_64/s6-dns b/variants/ccx-x86_64/s6-dns
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+skalibs.5456da6512d0aa9a7f27efc983555eda5280accfc3dbab64be95086e2eeaea53
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+skalibs.fdc273713250725a8bcf3add5ec6161ff7b7d504eb30febdc27a0520c891b329
 #@git:dc80225c0a78346300d100f0bf0182ed338c4b01:s6-dns
 
 
@@ -48,7 +46,7 @@ cd 's6-dns'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.5456da6512d0aa9a7f27efc983555eda5280accfc3dbab64be95086e2eeaea53/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.fdc273713250725a8bcf3add5ec6161ff7b7d504eb30febdc27a0520c891b329/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/ccx-x86_64/s6-linux-init b/variants/ccx-x86_64/s6-linux-init
@@ -1,39 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+skalibs.5456da6512d0aa9a7f27efc983555eda5280accfc3dbab64be95086e2eeaea53
-#+execline.b87277dfe0acb94786dab9a874a9d2ad37b5db424de8e17e6e363fef332b6766
-#+s6.d963ad9ca000b880b0cf6e44b9207bdfe338fae5c5ef132c623413d38ba3ba83
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+skalibs.fdc273713250725a8bcf3add5ec6161ff7b7d504eb30febdc27a0520c891b329
+#+execline.5f80fdb7ce341ec75727ca2fd6170200fceef77821d4dd3e9e55a4b6bc7607d9
+#+s6.34c09d31d26075ada62b33cf0d7269415af83e8dd45a5ce28121cc55cac022c4
 #@git:b298e515efe16210048e504e3aec89ea1e627b73:s6-linux-init
 
 
@@ -50,7 +48,7 @@ cd 's6-linux-init'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.5456da6512d0aa9a7f27efc983555eda5280accfc3dbab64be95086e2eeaea53/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.fdc273713250725a8bcf3add5ec6161ff7b7d504eb30febdc27a0520c891b329/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/ccx-x86_64/s6-linux-utils b/variants/ccx-x86_64/s6-linux-utils
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+skalibs.5456da6512d0aa9a7f27efc983555eda5280accfc3dbab64be95086e2eeaea53
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+skalibs.fdc273713250725a8bcf3add5ec6161ff7b7d504eb30febdc27a0520c891b329
 #@git:a9e7acac41a8854546246dd39cb4daee54ead2cb:s6-linux-utils
 
 
@@ -48,7 +46,7 @@ cd 's6-linux-utils'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.5456da6512d0aa9a7f27efc983555eda5280accfc3dbab64be95086e2eeaea53/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.fdc273713250725a8bcf3add5ec6161ff7b7d504eb30febdc27a0520c891b329/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/ccx-x86_64/s6-networking b/variants/ccx-x86_64/s6-networking
@@ -1,41 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+skalibs.5456da6512d0aa9a7f27efc983555eda5280accfc3dbab64be95086e2eeaea53
-#+execline.b87277dfe0acb94786dab9a874a9d2ad37b5db424de8e17e6e363fef332b6766
-#+s6.d963ad9ca000b880b0cf6e44b9207bdfe338fae5c5ef132c623413d38ba3ba83
-#+s6-dns.8e249fe6c12b209c5354d27555ae7f7e6bbce94794d138b9947a4e2385339db2
-#+libressl.5014a45ebeba049f96b1442e3f11880d71f918c4ee444ae78ef1010ee65384c1
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+skalibs.fdc273713250725a8bcf3add5ec6161ff7b7d504eb30febdc27a0520c891b329
+#+execline.5f80fdb7ce341ec75727ca2fd6170200fceef77821d4dd3e9e55a4b6bc7607d9
+#+s6.34c09d31d26075ada62b33cf0d7269415af83e8dd45a5ce28121cc55cac022c4
+#+s6-dns.db0519790246853a73d8314a99f52b100a7b39d9498e4c24d4b61249d990b3c7
+#+libressl.cd8c8972c5fd319c44b2708144ca27ea42b323dd57d79ba4e631e52bcd30e275
 #@git:12b40106ed1727274cd6af379c4ba0ca7161700b:s6-networking
 
 
@@ -52,7 +50,7 @@ cd 's6-networking'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.5456da6512d0aa9a7f27efc983555eda5280accfc3dbab64be95086e2eeaea53/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.fdc273713250725a8bcf3add5ec6161ff7b7d504eb30febdc27a0520c891b329/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/ccx-x86_64/s6-portable-utils b/variants/ccx-x86_64/s6-portable-utils
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+skalibs.5456da6512d0aa9a7f27efc983555eda5280accfc3dbab64be95086e2eeaea53
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+skalibs.fdc273713250725a8bcf3add5ec6161ff7b7d504eb30febdc27a0520c891b329
 #@git:dc96d8a020e83b16dd7a8bd093bdb00ab2b944c0:s6-portable-utils
 
 
@@ -48,7 +46,7 @@ cd 's6-portable-utils'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.5456da6512d0aa9a7f27efc983555eda5280accfc3dbab64be95086e2eeaea53/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.fdc273713250725a8bcf3add5ec6161ff7b7d504eb30febdc27a0520c891b329/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/ccx-x86_64/s6-rc b/variants/ccx-x86_64/s6-rc
@@ -1,39 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+skalibs.5456da6512d0aa9a7f27efc983555eda5280accfc3dbab64be95086e2eeaea53
-#+execline.b87277dfe0acb94786dab9a874a9d2ad37b5db424de8e17e6e363fef332b6766
-#+s6.d963ad9ca000b880b0cf6e44b9207bdfe338fae5c5ef132c623413d38ba3ba83
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+skalibs.fdc273713250725a8bcf3add5ec6161ff7b7d504eb30febdc27a0520c891b329
+#+execline.5f80fdb7ce341ec75727ca2fd6170200fceef77821d4dd3e9e55a4b6bc7607d9
+#+s6.34c09d31d26075ada62b33cf0d7269415af83e8dd45a5ce28121cc55cac022c4
 #@git:a4756f00b3823952580d1fee704675c6f813a248:s6-rc
 
 
@@ -50,7 +48,7 @@ cd 's6-rc'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.5456da6512d0aa9a7f27efc983555eda5280accfc3dbab64be95086e2eeaea53/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.fdc273713250725a8bcf3add5ec6161ff7b7d504eb30febdc27a0520c891b329/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/ccx-x86_64/skalibs b/variants/ccx-x86_64/skalibs
@@ -1,36 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
 #@git:96b537f42695da1b865588baf591fdfcae76bd41:skalibs
 
 
diff --git a/variants/ccx-x86_64/snaprep b/variants/ccx-x86_64/snaprep
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+zsh.c9ff605cba8b7ab3cc834a858e600d75365f0d472df7827bc4304e7f2b161713
-#+pthbs-banginstall.098f2600d99924c8e1d79ad1af13fd2798200bbd23e06c680fa45a0c1cd627d7
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+zsh.5e6964dc3be6822ea25475d86d39ce18b171d6d4316ff2479a9848e06875367f
+#+pthbs-banginstall.d658ea1c780deb3de5fdce5161786491fd32c1dc84b863aa13a01bfaf15e0acf
 #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep
 
 
diff --git a/variants/ccx-x86_64/squashfs-tools b/variants/ccx-x86_64/squashfs-tools
@@ -1,39 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+attr.3b9678e2d6ff6328c39382b347dac4eba14dec414ebfa3c5d86f07dddcaf2d44
-#+zstd.06b8da2f7f8fbd89ec0350960d26c5fcc28a73147508ac97ebd1387dbe0f9b78
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+attr.873d324e7164fbe489bbf3eef6e158b70615d7a927915a3bffd1ec049daed56e
+#+zstd.c03a460188a9d2b637fe5761a111c00b9aec370688e0246cb3d763100991f226
 #@untar:-z:sha256:4672b5c47d9418d3a5ae5b243defc6d9eae8275b9771022247c6a6082c815914:.
 
 
diff --git a/variants/ccx-x86_64/strace b/variants/ccx-x86_64/strace
@@ -1,40 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+m4.0c844229567ffdfcd436bc4d8ac5e6a19154427bccc49379b4f855b1ed3ce7e1
-#+patch.f6b6edfce98acd976b39b2fe2cc9057d7473c71171f6f1789d72a8b122dda60c
-#+libunwind.8f4f7c0bea2287538920a77cb972d20e2a756b51d596c7cde57f49391fafc4ea
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+m4.3353c8ccf091da3cfebd3dae109d466a1467afb4d8a762db92a1e57b3bb70b1c
+#+patch.5272590ddc980d98e6454b3fa5b4ad4cbf1f937c6bbdae97e024e6240b2db58b
+#+libunwind.ddcd532c137e4d0220d4bdd60958f34d91dc46221afb6c0fd7207db923096eff
 #@sha256:37d93db7135d47852dbe763f1b18b3aeab142431a6f5268a17fc700387a326e4:strace-6.5-static.patch
 #@untar:-J:sha256:e209daf0ee038ca5adcc4c277e9273b4d51f46a2ff86da575d36742ac3508a17:.
 
diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config
@@ -1,67 +1,67 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-dosfstools.09e8c07fe43511248b8e976df0a7f09e90cf353cd235baf3d3a207aca132a158
-#+busybox-e2fsprogs.98e6a090002a1b2834f2ddd71211f52b662e414006a8c520b4596552a894c777
-#+busybox-iproute2.b46f4e1870a13357c575b5e48db34ba7f98e48b7a838ae7027983202a841edc6
-#+busybox-iputils.af9643b60639844e67e066519c692023160e3f94962f86e8e00799e341371acb
-#+busybox-net-misc.7c1a2a37d675a3930447230c1b052ae893e07b3d47b463382d2323e9655ea91e
-#+busybox-net-tools.c0927850259a3cef38d03ef44fd5a6caefa280c1e74f3bbe160c8ce359c022d9
-#+busybox-traceroute.2f574f2b25afda19655180dc3711feac3951774f3103e52f92e0372a9b94da66
-#+busybox-wget.43ecada93e7662300d0da3f4bb0f290c38b1769e75103707fcf92d696e4489e2
-#+busybox-chpst.1c1d5088326b9e97edd30dd2bdd438119ea24e12fccf40f9b2471161ce873fb1
-#+busybox-console.3ea8a865657409661d0601333c1f5d8bd79b9882c6af044814db4f50a8525188
-#+busybox-getty.a66d68cf25da8fac3cf8b1bed75b80300b967eec6a347ebdbabc5d824282adfe
-#+busybox-i2c-tools.bdde4180b4913462c43e44dd6fb39bcee3fc259dae690b95faccb7f3a24276a7
-#+busybox-linux-extra.a4208dfef25dc347b43cce38b89e7c00dd39acf339ebc78fb8e82cc887a89a6e
-#+busybox-mtd-utils.02263cef188489ba3db0ee5d07168a92aa8c4e4664785890ec00b1be7de633ff
-#+busybox-shadow.ba5c90664e648aa730a9f4c133a272f31bdd0b2807efaea6e44b960506049214
-#+busybox-su.972ae119d66a49ca52b33a4ab46cc5c9c5aa3db857e132e3f6ad7a9329010dc2
-#+busybox-util-linux-priv.83fd134d100cc6ab7c12f10afd0a51e9be28be7335dc2beea1ee01c722822a6f
-#+busybox-logging.9991dbce9a635e00954425a5aa899d8aa6b68e566bf000118502542f301af8b3
-#+busybox-cron.a059ab9c97b239a9d0a27f246a09d7ed31238e45bf21c754474a1034cf20ad6f
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+nawk.5f1f4b2334ef21dfe9770754962a16a9d0bedb9795a4a61914d0a4c06423dfdc
-#+diffutils.c3fc24f6c64356a5a4fc6695b9f1348f3530184edd0481de43fc5316b15f6db8
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+aat.afa1d64dc4cd53d5f61c5887a7aa0c5c5d7274ebe214b4db1318cdf0af8c7560
-#+fileset.e51dcab7c21ef895507bd851870e6fc7f1877dc4fa63e4b55cde15cb7bd0e293
-#+rsync.afc95c58c9466446ffc6091c464459fcd789a64a39e93f75e6e2beae97cfd9c2
-#+execline.b87277dfe0acb94786dab9a874a9d2ad37b5db424de8e17e6e363fef332b6766
-#+kbd.ad725fd18a05be469077c74700c3a021597dd11f7bd6c52f08be4e6f5435282e
-#+mdevd.930127dac6eecae899be404cbcc311aa2247c3427ade9c4bb1111a4fc5d3d1de
-#+s6-linux-utils.518e846c1db76e253e16f978574433736fcaf5444bb9a06f3b1a585af49119db
-#+s6-rc.555380a64902b1fb0ebc0ade63ab705e13e56bdf67f6bdcabca12089d62a14b9
-#+s6.d963ad9ca000b880b0cf6e44b9207bdfe338fae5c5ef132c623413d38ba3ba83
-#+zsh.c9ff605cba8b7ab3cc834a858e600d75365f0d472df7827bc4304e7f2b161713
-#+libcgroup.ca464a8d0f97360467d416662f6e65c6201a01aaef07da6bf4e611984af745e1
-#+system-config-scripts.db59932a4e120de2f52bc3ba335e8844458faa41b5deed28e5587d58e7b402a7
-#+logincaps.49c330489c7f46ac61de00f43eb2d5ff4ec53290deec4a9027dddabb62ec0841
-#+busybox.99f3c7039a4e6f368584f7093c5fe92fd8a05b3bd5ac548201e5f51dad078436
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-dosfstools.074e7ac6f86295033f8599b74fa9df92b291baba4fd3b5bc0aca4067a247c873
+#+busybox-e2fsprogs.9291576bf241ac2a8136b1515f10bc38b7b8ed74101a97a8b7f6d8743c742f91
+#+busybox-iproute2.93067047ba7dd262538a7fafb3e0f0efdde7e9f89199a5d19d9c485cc080d73a
+#+busybox-iputils.51a82d350eea617752239f5398df3c4c2951fb8634a69596d9951321065a8abb
+#+busybox-net-misc.90b1234bbbad66e9538e49e8a9c7630542e8d1895872db1c478ca1f942a8ae1c
+#+busybox-net-tools.2e0c91ab8dcd470a4a7e5e770705144478e56c31972b69bfd3475690a01f8f81
+#+busybox-traceroute.21e3cbe48767842789944452d0997a705e6035eb5ec42eb41263e5e7b60a8ed1
+#+busybox-wget.e647ed31cec5707850c15bdf123a066d5800966761038897f1ed6c56d908a1a2
+#+busybox-chpst.dc07b73f710cbad446343fa09a8fef8ee8184ac50e6e82cf4afaff4353dcdd2e
+#+busybox-console.1034e05c2f70346f2e9c847603dbf9e3be37fc759d5cc4522addb0d05477e4a0
+#+busybox-getty.1d5ad8b877058aded48b7e4e4886c31ae813a6fe61b1d3f3357b151cb5d71d48
+#+busybox-i2c-tools.30f44eff3ba62b1fe0e6862a058aae3046326e985e1b15deed8a1286d2d8676f
+#+busybox-linux-extra.888e992de26923278c987256e857716d04af400741b65e70235e45999d091536
+#+busybox-mtd-utils.6adb145c1a674e9bd17f9fbb8de2685d012aba46328a0f4e4be87cf2190ac570
+#+busybox-shadow.be5c1f3eab07d1d2d08d160e334d4aa8d77ee9eebd0af5214a22e07fc9b4f547
+#+busybox-su.f7e8c4a880fc2f2c9efc603227ef3643f5f2560310299b4dd5182501be0758ff
+#+busybox-util-linux-priv.5377559d96ce4229535cd0605dc511e76ffe95c56a87c7df4021ebbb039fb805
+#+busybox-logging.ca771c2979623accaa0452dad1c9494699f646f4a9ccd865969a57ba49bb9da9
+#+busybox-cron.8d0c19a36baeffdb7b3da8488569af29cfc9e0f1a207a8460cdfee21616c3f18
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+nawk.0ffb368f1e19d8db634f7c2bcdb4b670f58e1509446bf8d5a4f5243b10a46483
+#+diffutils.3d2e21b2ea04282ac99a7586f7918e4110cff8a7822a8424257e8960144fada0
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+aat.c09149d390780b3d1b7a3f0203167111b3d83373e264c56143f12f2af8915282
+#+fileset.0f1c761e875fb3b456622c4b4e31010811fcaf0e74ed8514f38e84afb7394859
+#+rsync.be8b13bec1cb7f02b7b1c66d74a2cd5603393a0fe4db3d41dd31d0d87563acd6
+#+execline.5f80fdb7ce341ec75727ca2fd6170200fceef77821d4dd3e9e55a4b6bc7607d9
+#+kbd.2d301f9b643f100abcc89d1b78fe581adcf55e65f80f96d185e36a4e2dcd609a
+#+mdevd.2719882ff534bd8b3b9846c2bc0d053a8d5119fd96c6eef352c057aee98ae4ee
+#+s6-linux-utils.dfda52c5eeb2fce71d68f1abe6211859bc1b8097feaa1c38f74e567fa8acfbbf
+#+s6-rc.1e1a783a2d59e58a89d9fdaa703d83815c178bfb708253d61925356c6bf8ecda
+#+s6.34c09d31d26075ada62b33cf0d7269415af83e8dd45a5ce28121cc55cac022c4
+#+zsh.5e6964dc3be6822ea25475d86d39ce18b171d6d4316ff2479a9848e06875367f
+#+libcgroup.c7466758e6a277458d131591e5dd1a107ee88991217fc3e15222b037554df966
+#+system-config-scripts.648af34cdb45988e4d506542342ae773901a91a83ff372214f04aba084a8b5ca
+#+logincaps.bf57c98bac79354434bc20609490546706ce77f69d5b23704b42a0aa2fd5515a
+#+busybox.d06ba44874e4589df604d8bbac67dc5ef215b396ec062e788bdaaa7a879f8c23
 #@git:055d24bac572481d7dedba7d4ec9df37f620fbfd:system-config
 
 
@@ -98,8 +98,8 @@ printf '%s\n' >config/etc/skel/loginexec \
 chmod +x config/etc/skel/loginexec
 
 env 'pthbs_path_system-config'="$prefix" \
-	'pthbs_path_containers=/home/ccx/versions/env.9ef74148f22f1d0e26e97ab5b343687386a30d5a6763afd44ec97732a0fc7d2c' \
-	'pthbs_path_mdevd=/home/ccx/versions/env.a5fbf41379a3f2ffa0fbf7c4336f774f4aa6452599d5156115dc9d3631491ab8' \
+	'pthbs_path_containers=/home/ccx/versions/env.56cc9af69fbd307c95ff45ba05ec6d214eb07fc57873bd742b4f6b88647877f8' \
+	'pthbs_path_mdevd=/home/ccx/versions/env.9e89c71d73c1a36b531b0a789e6ee240afc7d94a71c15d613b47b40655db2b33' \
 	make -j${JOBS:-1} -l$((1+${JOBS:-1})) all
 
 sort -u build/execfile | while IFS= read exename; do
diff --git a/variants/ccx-x86_64/system-config-init b/variants/ccx-x86_64/system-config-init
@@ -1,57 +1,57 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-dosfstools.09e8c07fe43511248b8e976df0a7f09e90cf353cd235baf3d3a207aca132a158
-#+busybox-e2fsprogs.98e6a090002a1b2834f2ddd71211f52b662e414006a8c520b4596552a894c777
-#+busybox-iproute2.b46f4e1870a13357c575b5e48db34ba7f98e48b7a838ae7027983202a841edc6
-#+busybox-iputils.af9643b60639844e67e066519c692023160e3f94962f86e8e00799e341371acb
-#+busybox-net-misc.7c1a2a37d675a3930447230c1b052ae893e07b3d47b463382d2323e9655ea91e
-#+busybox-net-tools.c0927850259a3cef38d03ef44fd5a6caefa280c1e74f3bbe160c8ce359c022d9
-#+busybox-traceroute.2f574f2b25afda19655180dc3711feac3951774f3103e52f92e0372a9b94da66
-#+busybox-wget.43ecada93e7662300d0da3f4bb0f290c38b1769e75103707fcf92d696e4489e2
-#+busybox-chpst.1c1d5088326b9e97edd30dd2bdd438119ea24e12fccf40f9b2471161ce873fb1
-#+busybox-console.3ea8a865657409661d0601333c1f5d8bd79b9882c6af044814db4f50a8525188
-#+busybox-getty.a66d68cf25da8fac3cf8b1bed75b80300b967eec6a347ebdbabc5d824282adfe
-#+busybox-i2c-tools.bdde4180b4913462c43e44dd6fb39bcee3fc259dae690b95faccb7f3a24276a7
-#+busybox-linux-extra.a4208dfef25dc347b43cce38b89e7c00dd39acf339ebc78fb8e82cc887a89a6e
-#+busybox-mtd-utils.02263cef188489ba3db0ee5d07168a92aa8c4e4664785890ec00b1be7de633ff
-#+busybox-shadow.ba5c90664e648aa730a9f4c133a272f31bdd0b2807efaea6e44b960506049214
-#+busybox-su.972ae119d66a49ca52b33a4ab46cc5c9c5aa3db857e132e3f6ad7a9329010dc2
-#+busybox-util-linux-priv.83fd134d100cc6ab7c12f10afd0a51e9be28be7335dc2beea1ee01c722822a6f
-#+busybox-logging.9991dbce9a635e00954425a5aa899d8aa6b68e566bf000118502542f301af8b3
-#+busybox-cron.a059ab9c97b239a9d0a27f246a09d7ed31238e45bf21c754474a1034cf20ad6f
-#+s6.d963ad9ca000b880b0cf6e44b9207bdfe338fae5c5ef132c623413d38ba3ba83
-#+s6-rc.555380a64902b1fb0ebc0ade63ab705e13e56bdf67f6bdcabca12089d62a14b9
-#+s6-portable-utils.36db3c4fd8df1eb3400beafd410407d0530b76911d0ba16f854981fb92d99dfb
-#+s6-linux-init.7a29c7b707e3b5531c0ccf6734c0681f89d9b4ff664e7da824c44bf7043cbb18
-#+execline.b87277dfe0acb94786dab9a874a9d2ad37b5db424de8e17e6e363fef332b6766
-#+system-config-rc.eaf437fda010bd4eeb7bf9a69c8f0b2418640698a90913b29016ce3cd1bd2958
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-dosfstools.074e7ac6f86295033f8599b74fa9df92b291baba4fd3b5bc0aca4067a247c873
+#+busybox-e2fsprogs.9291576bf241ac2a8136b1515f10bc38b7b8ed74101a97a8b7f6d8743c742f91
+#+busybox-iproute2.93067047ba7dd262538a7fafb3e0f0efdde7e9f89199a5d19d9c485cc080d73a
+#+busybox-iputils.51a82d350eea617752239f5398df3c4c2951fb8634a69596d9951321065a8abb
+#+busybox-net-misc.90b1234bbbad66e9538e49e8a9c7630542e8d1895872db1c478ca1f942a8ae1c
+#+busybox-net-tools.2e0c91ab8dcd470a4a7e5e770705144478e56c31972b69bfd3475690a01f8f81
+#+busybox-traceroute.21e3cbe48767842789944452d0997a705e6035eb5ec42eb41263e5e7b60a8ed1
+#+busybox-wget.e647ed31cec5707850c15bdf123a066d5800966761038897f1ed6c56d908a1a2
+#+busybox-chpst.dc07b73f710cbad446343fa09a8fef8ee8184ac50e6e82cf4afaff4353dcdd2e
+#+busybox-console.1034e05c2f70346f2e9c847603dbf9e3be37fc759d5cc4522addb0d05477e4a0
+#+busybox-getty.1d5ad8b877058aded48b7e4e4886c31ae813a6fe61b1d3f3357b151cb5d71d48
+#+busybox-i2c-tools.30f44eff3ba62b1fe0e6862a058aae3046326e985e1b15deed8a1286d2d8676f
+#+busybox-linux-extra.888e992de26923278c987256e857716d04af400741b65e70235e45999d091536
+#+busybox-mtd-utils.6adb145c1a674e9bd17f9fbb8de2685d012aba46328a0f4e4be87cf2190ac570
+#+busybox-shadow.be5c1f3eab07d1d2d08d160e334d4aa8d77ee9eebd0af5214a22e07fc9b4f547
+#+busybox-su.f7e8c4a880fc2f2c9efc603227ef3643f5f2560310299b4dd5182501be0758ff
+#+busybox-util-linux-priv.5377559d96ce4229535cd0605dc511e76ffe95c56a87c7df4021ebbb039fb805
+#+busybox-logging.ca771c2979623accaa0452dad1c9494699f646f4a9ccd865969a57ba49bb9da9
+#+busybox-cron.8d0c19a36baeffdb7b3da8488569af29cfc9e0f1a207a8460cdfee21616c3f18
+#+s6.34c09d31d26075ada62b33cf0d7269415af83e8dd45a5ce28121cc55cac022c4
+#+s6-rc.1e1a783a2d59e58a89d9fdaa703d83815c178bfb708253d61925356c6bf8ecda
+#+s6-portable-utils.6a9b8251669ba0d7df98415fce5af7e0228ec17adece0b60ba47973d0a9e3137
+#+s6-linux-init.bbba4c29191121de6c13c52371f29522a1f25dfb04d9ea75b60709cf09a93d12
+#+execline.5f80fdb7ce341ec75727ca2fd6170200fceef77821d4dd3e9e55a4b6bc7607d9
+#+system-config-rc.07137bcc070d648740f4a143fce74e1383e5d7f155cdd80ef0d08d031ada08e0
 
 
 # - build script start -
@@ -76,7 +76,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-s6rcdb=/home/ccx/versions/system-config-rc.eaf437fda010bd4eeb7bf9a69c8f0b2418640698a90913b29016ce3cd1bd2958/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.07137bcc070d648740f4a143fce74e1383e5d7f155cdd80ef0d08d031ada08e0/config/s6-rc-db
 
 # Generate init (${dest} must not exist but parent dir does)
 mkdir -p "$pthbs_destdir//home/ccx/versions"
diff --git a/variants/ccx-x86_64/system-config-rc b/variants/ccx-x86_64/system-config-rc
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+s6-rc.555380a64902b1fb0ebc0ade63ab705e13e56bdf67f6bdcabca12089d62a14b9
-#+fileset.e51dcab7c21ef895507bd851870e6fc7f1877dc4fa63e4b55cde15cb7bd0e293
-#+system-config.433a96ddf9be335eb3e7192e67aabf0dca52bd6b1704e753d05a7d2622fdb860
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+s6-rc.1e1a783a2d59e58a89d9fdaa703d83815c178bfb708253d61925356c6bf8ecda
+#+fileset.0f1c761e875fb3b456622c4b4e31010811fcaf0e74ed8514f38e84afb7394859
+#+system-config.98838b17aab525261ae0079f11fd630a959efd697ca7afde2cc57cf2350c8560
 
 
 # - build script start -
@@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-src=/home/ccx/versions/system-config.433a96ddf9be335eb3e7192e67aabf0dca52bd6b1704e753d05a7d2622fdb860/config/s6-rc-source
+src=/home/ccx/versions/system-config.98838b17aab525261ae0079f11fd630a959efd697ca7afde2cc57cf2350c8560/config/s6-rc-source
 s6-rc-compile ./s6-rc-db "$src"
 mkdir -p "$dest/config"
 mv -v s6-rc-db "$dest/config/"
diff --git a/variants/ccx-x86_64/system-config-scripts b/variants/ccx-x86_64/system-config-scripts
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+zsh.c9ff605cba8b7ab3cc834a858e600d75365f0d472df7827bc4304e7f2b161713
-#+pthbs-banginstall.098f2600d99924c8e1d79ad1af13fd2798200bbd23e06c680fa45a0c1cd627d7
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+zsh.5e6964dc3be6822ea25475d86d39ce18b171d6d4316ff2479a9848e06875367f
+#+pthbs-banginstall.d658ea1c780deb3de5fdce5161786491fd32c1dc84b863aa13a01bfaf15e0acf
 #@git:dc793695cc0632a808af9d4415f3b0cf0f4dfba2:system-config-scripts
 
 
diff --git a/variants/ccx-x86_64/system-config-zsh b/variants/ccx-x86_64/system-config-zsh
@@ -1,33 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+zsh.c9ff605cba8b7ab3cc834a858e600d75365f0d472df7827bc4304e7f2b161713
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+zsh.5e6964dc3be6822ea25475d86d39ce18b171d6d4316ff2479a9848e06875367f
 #@git:6dfbe33079e2f8c64c5daed29aa1ea3e7e3f2d59:system-config-zsh
 
 
diff --git a/variants/ccx-x86_64/tinyssh b/variants/ccx-x86_64/tinyssh
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
 #@untar:-z:sha256:f3ae622c765db4e0d791ea90a9feba39d7f693ef9cb949a797f7ad6b404a2d61:.
 
 
diff --git a/variants/ccx-x86_64/user-env b/variants/ccx-x86_64/user-env
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+execline.b87277dfe0acb94786dab9a874a9d2ad37b5db424de8e17e6e363fef332b6766
-#+pthbs-banginstall.098f2600d99924c8e1d79ad1af13fd2798200bbd23e06c680fa45a0c1cd627d7
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+execline.5f80fdb7ce341ec75727ca2fd6170200fceef77821d4dd3e9e55a4b6bc7607d9
+#+pthbs-banginstall.d658ea1c780deb3de5fdce5161786491fd32c1dc84b863aa13a01bfaf15e0acf
 #@sha256:664430d033e0b491a5ed90cb39cb17cddb57ac0be9f3f2bf014264f3c17d55df:user-env
 
 
diff --git a/variants/ccx-x86_64/userspace.environment b/variants/ccx-x86_64/userspace.environment
@@ -1,93 +1,91 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-dosfstools.09e8c07fe43511248b8e976df0a7f09e90cf353cd235baf3d3a207aca132a158
-#+busybox-e2fsprogs.98e6a090002a1b2834f2ddd71211f52b662e414006a8c520b4596552a894c777
-#+busybox-iproute2.b46f4e1870a13357c575b5e48db34ba7f98e48b7a838ae7027983202a841edc6
-#+busybox-iputils.af9643b60639844e67e066519c692023160e3f94962f86e8e00799e341371acb
-#+busybox-net-misc.7c1a2a37d675a3930447230c1b052ae893e07b3d47b463382d2323e9655ea91e
-#+busybox-net-tools.c0927850259a3cef38d03ef44fd5a6caefa280c1e74f3bbe160c8ce359c022d9
-#+busybox-traceroute.2f574f2b25afda19655180dc3711feac3951774f3103e52f92e0372a9b94da66
-#+busybox-wget.43ecada93e7662300d0da3f4bb0f290c38b1769e75103707fcf92d696e4489e2
-#+busybox-chpst.1c1d5088326b9e97edd30dd2bdd438119ea24e12fccf40f9b2471161ce873fb1
-#+busybox-console.3ea8a865657409661d0601333c1f5d8bd79b9882c6af044814db4f50a8525188
-#+busybox-getty.a66d68cf25da8fac3cf8b1bed75b80300b967eec6a347ebdbabc5d824282adfe
-#+busybox-i2c-tools.bdde4180b4913462c43e44dd6fb39bcee3fc259dae690b95faccb7f3a24276a7
-#+busybox-linux-extra.a4208dfef25dc347b43cce38b89e7c00dd39acf339ebc78fb8e82cc887a89a6e
-#+busybox-mtd-utils.02263cef188489ba3db0ee5d07168a92aa8c4e4664785890ec00b1be7de633ff
-#+busybox-shadow.ba5c90664e648aa730a9f4c133a272f31bdd0b2807efaea6e44b960506049214
-#+busybox-su.972ae119d66a49ca52b33a4ab46cc5c9c5aa3db857e132e3f6ad7a9329010dc2
-#+busybox-util-linux-priv.83fd134d100cc6ab7c12f10afd0a51e9be28be7335dc2beea1ee01c722822a6f
-#+busybox-logging.9991dbce9a635e00954425a5aa899d8aa6b68e566bf000118502542f301af8b3
-#+busybox-cron.a059ab9c97b239a9d0a27f246a09d7ed31238e45bf21c754474a1034cf20ad6f
-#+attr.3b9678e2d6ff6328c39382b347dac4eba14dec414ebfa3c5d86f07dddcaf2d44
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+diffutils.c3fc24f6c64356a5a4fc6695b9f1348f3530184edd0481de43fc5316b15f6db8
-#+patch.f6b6edfce98acd976b39b2fe2cc9057d7473c71171f6f1789d72a8b122dda60c
-#+flex.f48cb27e48bb9d2db6755b12817419a61d1512ac9dadeb38767de2a7e69f3dba
-#+bison.9513e3c994e065861ffc9797e92e157593a5202399f921e98631feea7384e043
-#+rsync.afc95c58c9466446ffc6091c464459fcd789a64a39e93f75e6e2beae97cfd9c2
-#+execline.b87277dfe0acb94786dab9a874a9d2ad37b5db424de8e17e6e363fef332b6766
-#+s6.d963ad9ca000b880b0cf6e44b9207bdfe338fae5c5ef132c623413d38ba3ba83
-#+s6-rc.555380a64902b1fb0ebc0ade63ab705e13e56bdf67f6bdcabca12089d62a14b9
-#+s6-portable-utils.36db3c4fd8df1eb3400beafd410407d0530b76911d0ba16f854981fb92d99dfb
-#+s6-linux-utils.518e846c1db76e253e16f978574433736fcaf5444bb9a06f3b1a585af49119db
-#+s6-linux-init.7a29c7b707e3b5531c0ccf6734c0681f89d9b4ff664e7da824c44bf7043cbb18
-#+mdevd.930127dac6eecae899be404cbcc311aa2247c3427ade9c4bb1111a4fc5d3d1de
-#+s6-dns.8e249fe6c12b209c5354d27555ae7f7e6bbce94794d138b9947a4e2385339db2
-#+libressl.5014a45ebeba049f96b1442e3f11880d71f918c4ee444ae78ef1010ee65384c1
-#+s6-networking.8c9fa8b1b83f4f94cf3529e37df45a0fa08d8e62ed2c86ba963480dbaa5ca265
-#+zsh.c9ff605cba8b7ab3cc834a858e600d75365f0d472df7827bc4304e7f2b161713
-#+pthbs-banginstall.098f2600d99924c8e1d79ad1af13fd2798200bbd23e06c680fa45a0c1cd627d7
-#+aat.afa1d64dc4cd53d5f61c5887a7aa0c5c5d7274ebe214b4db1318cdf0af8c7560
-#+confz.6570308f31a89659ff1960e1ad9cfba1d7c022416002707af279f5bff2c1445f
-#+containers.57d65c57f8d312c8bed4a59f75259097aca1ace5a190b9eba89d091bf0349a37
-#+fileset.e51dcab7c21ef895507bd851870e6fc7f1877dc4fa63e4b55cde15cb7bd0e293
-#+logincaps.49c330489c7f46ac61de00f43eb2d5ff4ec53290deec4a9027dddabb62ec0841
-#+snaprep.efffc87c2f3ed669008770c48c0a0b4fd08324000e325c15be0464f2c28b6e83
-#+curl.924f5bac0fa3eced991606eb6ef2dbfc4783f5c45569f871ed82f5dd354fb268
-#+git.6448893d029ff67d9aa8a99c6d8a90c69218bdcedcba5c2700ee822704fd6008
-#+xbps.8baac699617c923f72e15d3697ae36def15f4cc793cd990caaa82caf3c2ab9e8
-#+apk-tools.4c74134ce256ba348307193c509d44f22c37a1baca8d43c067f6a4bba8775fac
-#+getent.d0b13b7027c9012769e7e98faba58dcdac719d7ce4a3fe7f48dac77db17d35cd
-#+getconf.9929ee975df8af08a213c7e249a2e66fa0cb2c67ec7042ebcdc366ba41a070c1
-#+iconv.91a633805dbda6baca1ffa34d45dd17259466066d3e79816de1ed336e9447840
-#+libcap.a5e29dc6d6519500cf638a71bf0a0470576db64ff4de8393dded5c225725e5b4
-#+applyuidgid-caps.a235f6491dccd6544e06162af44dc59775310995b3dccc784ca829f89feee9d5
-#+ccx-utils.92d4108871f348231ea5b358312d1bb9dfbb434d0d535ece261773ba22290c1b
-#+user-env.668680d21d323780f5f347345a908f5efde9280a07e849c852d513009939eb95
-#+strace.dcacdbacdbbc02be4d6c0ba5797af23913f2119591c0102cda962de895175091
-#+mlog.aa2de6bd06c0f4c3936da1fdaaed1c426516582248fa7cec37624aae774c5913
-#+findutils.48585975c0a78bc86137cee9f57ed9e61302b74db403d4b575cdca8b357d57cc
-#+nawk.5f1f4b2334ef21dfe9770754962a16a9d0bedb9795a4a61914d0a4c06423dfdc
-#+nvi.79ef60f9aa85bb7929e0e23650d3f49ef2e5006f32c86b821c81dfe6c562919f
-#+squashfs-tools.8b37a9701970fcd54ffafa8133e14dc5444bd612d43ae90fe08d9091812ee802
-#+mandoc.a7dc5276040de6070aaae641a5a4147b9a7544bc98c09db47a0b2947b267d16c
-#+tinyssh.9b7643c492d0ebba375406c0d8a8e0f83329a69edb24db5e506c82f2171cedba-
\ No newline at end of file
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-dosfstools.074e7ac6f86295033f8599b74fa9df92b291baba4fd3b5bc0aca4067a247c873
+#+busybox-e2fsprogs.9291576bf241ac2a8136b1515f10bc38b7b8ed74101a97a8b7f6d8743c742f91
+#+busybox-iproute2.93067047ba7dd262538a7fafb3e0f0efdde7e9f89199a5d19d9c485cc080d73a
+#+busybox-iputils.51a82d350eea617752239f5398df3c4c2951fb8634a69596d9951321065a8abb
+#+busybox-net-misc.90b1234bbbad66e9538e49e8a9c7630542e8d1895872db1c478ca1f942a8ae1c
+#+busybox-net-tools.2e0c91ab8dcd470a4a7e5e770705144478e56c31972b69bfd3475690a01f8f81
+#+busybox-traceroute.21e3cbe48767842789944452d0997a705e6035eb5ec42eb41263e5e7b60a8ed1
+#+busybox-wget.e647ed31cec5707850c15bdf123a066d5800966761038897f1ed6c56d908a1a2
+#+busybox-chpst.dc07b73f710cbad446343fa09a8fef8ee8184ac50e6e82cf4afaff4353dcdd2e
+#+busybox-console.1034e05c2f70346f2e9c847603dbf9e3be37fc759d5cc4522addb0d05477e4a0
+#+busybox-getty.1d5ad8b877058aded48b7e4e4886c31ae813a6fe61b1d3f3357b151cb5d71d48
+#+busybox-i2c-tools.30f44eff3ba62b1fe0e6862a058aae3046326e985e1b15deed8a1286d2d8676f
+#+busybox-linux-extra.888e992de26923278c987256e857716d04af400741b65e70235e45999d091536
+#+busybox-mtd-utils.6adb145c1a674e9bd17f9fbb8de2685d012aba46328a0f4e4be87cf2190ac570
+#+busybox-shadow.be5c1f3eab07d1d2d08d160e334d4aa8d77ee9eebd0af5214a22e07fc9b4f547
+#+busybox-su.f7e8c4a880fc2f2c9efc603227ef3643f5f2560310299b4dd5182501be0758ff
+#+busybox-util-linux-priv.5377559d96ce4229535cd0605dc511e76ffe95c56a87c7df4021ebbb039fb805
+#+busybox-logging.ca771c2979623accaa0452dad1c9494699f646f4a9ccd865969a57ba49bb9da9
+#+busybox-cron.8d0c19a36baeffdb7b3da8488569af29cfc9e0f1a207a8460cdfee21616c3f18
+#+attr.873d324e7164fbe489bbf3eef6e158b70615d7a927915a3bffd1ec049daed56e
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+diffutils.3d2e21b2ea04282ac99a7586f7918e4110cff8a7822a8424257e8960144fada0
+#+patch.5272590ddc980d98e6454b3fa5b4ad4cbf1f937c6bbdae97e024e6240b2db58b
+#+flex.e37d4b764fbfd05e10ccdcd2b972e8947ea57e7c55b9457bac56df108430020b
+#+bison.e42f39799b230f40fb038648ddbe5a5e205dec95a78c7afe4f442a23209419d7
+#+rsync.be8b13bec1cb7f02b7b1c66d74a2cd5603393a0fe4db3d41dd31d0d87563acd6
+#+execline.5f80fdb7ce341ec75727ca2fd6170200fceef77821d4dd3e9e55a4b6bc7607d9
+#+s6.34c09d31d26075ada62b33cf0d7269415af83e8dd45a5ce28121cc55cac022c4
+#+s6-rc.1e1a783a2d59e58a89d9fdaa703d83815c178bfb708253d61925356c6bf8ecda
+#+s6-portable-utils.6a9b8251669ba0d7df98415fce5af7e0228ec17adece0b60ba47973d0a9e3137
+#+s6-linux-utils.dfda52c5eeb2fce71d68f1abe6211859bc1b8097feaa1c38f74e567fa8acfbbf
+#+s6-linux-init.bbba4c29191121de6c13c52371f29522a1f25dfb04d9ea75b60709cf09a93d12
+#+mdevd.2719882ff534bd8b3b9846c2bc0d053a8d5119fd96c6eef352c057aee98ae4ee
+#+s6-dns.db0519790246853a73d8314a99f52b100a7b39d9498e4c24d4b61249d990b3c7
+#+libressl.cd8c8972c5fd319c44b2708144ca27ea42b323dd57d79ba4e631e52bcd30e275
+#+s6-networking.23a42aaf78a0f07bf01677d73204a05da4048a6c5b8757b7bd1bce02ae1f862c
+#+zsh.5e6964dc3be6822ea25475d86d39ce18b171d6d4316ff2479a9848e06875367f
+#+pthbs-banginstall.d658ea1c780deb3de5fdce5161786491fd32c1dc84b863aa13a01bfaf15e0acf
+#+aat.c09149d390780b3d1b7a3f0203167111b3d83373e264c56143f12f2af8915282
+#+confz.92bc7695ac129a2e608c339c94219372c57f6fb46e73ed2fbfa119d69556800e
+#+containers.c9632acf86a68989d39a5ced84814314030b5716fdbcc6097411e5f0beb04d1f
+#+fileset.0f1c761e875fb3b456622c4b4e31010811fcaf0e74ed8514f38e84afb7394859
+#+logincaps.bf57c98bac79354434bc20609490546706ce77f69d5b23704b42a0aa2fd5515a
+#+snaprep.98c82a76b7706ae037f1bdf7e61702aa80b5fb13553c75fc80b05fad14415777
+#+curl.1345acbd0f8b3f7bd03eae6617b7adfd3fca50d0ddab5d7b5dc713028cba506a
+#+git.bbb0f462d35b1359d01d7dc59716f9b3f8135ca39fe5926037b825222bc7639d
+#+xbps.66ad29067bd245c7e3e8a7a7a2a76d11b6462764f6703d6d07c536ad31b80c2d
+#+apk-tools.abd3ea463cdb72c7b24a23278890904a284ae8e05e0b228b57929ac71f483421
+#+getent.b09fecdd9dd058730e90b6e7b41d3a6f15e74a116f09c0d4dcbf18bf0c65df0c
+#+getconf.fa089cdd2b7841090a50b68454265f05e1fb3b8f314ff9eaee4599d4a78e1d97
+#+iconv.0a982c2e652aabf4fdcb7fb89105e02f87cc7e9f110991936198e8a7ffe90bc1
+#+libcap.b53bdc820b5cd0adc396aedbdd5f0406c2eef479e4df6ba54bb1f24f1e0a3ad9
+#+applyuidgid-caps.e2aff655dc84b63b5a11e72534e7ee0e811902de72456461c18fcae833e48aad
+#+ccx-utils.320116e7d9c60e50b3570c43e7cb8a5add24522635b7adebd0c9890ad9fb8d95
+#+user-env.c7d907f9c9d190143c516ce77a6cece490ed7534f039c8ed563a3bcce3e88e30
+#+strace.139e4927deab9216c8439bfa655db221187693c91c045eed4dc68627219e3318
+#+mlog.2003a5f8995e6f9bc2d6448bdc4f0cae53ca8e654e896ca77214ebdb7df01c6a
+#+findutils.7aaa6390fd43a315a90aefe4577dec7fa77d22b138516984558a1fec910565a2
+#+nawk.0ffb368f1e19d8db634f7c2bcdb4b670f58e1509446bf8d5a4f5243b10a46483
+#+nvi.97b78806190bcef1ae0429e84e66d129d156726e2f60f351a76ba50b12f89270
+#+squashfs-tools.ef5aecb9b8daa46b57784f67a22161110717e1ba8de6f5cb922d4fba0efdd1cd
+#+mandoc.ac63fd2fb09eb5d1e325d3e04c744526f7fe6e7a0d26d3ba2cd24644df27814c
+#+tinyssh.83608f173f06bad3ac18a7c55144048a784c93c7f39567dc58d73d2927e647be+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/vm.environment b/variants/ccx-x86_64/vm.environment
@@ -1,2 +1,2 @@
 #!/usr/bin/env pthbs-build
-#+linux-qemu-guest.5a044650e626a0b2b2f131f92f3b5ae497365a55e417d210c1f8ef7e6c0d95b3-
\ No newline at end of file
+#+linux-qemu-guest.9f0d35996ef7c9f3a46c17c468ca88a7058189ef4484fee6b6f629a2a8b3c750+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/xbps b/variants/ccx-x86_64/xbps
@@ -1,39 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+libarchive.4bbc18aab90f8de9e169056e2f89fad3b701bf5db33a6f12ec64d3e03856e885
-#+libressl.5014a45ebeba049f96b1442e3f11880d71f918c4ee444ae78ef1010ee65384c1
-#+pkgconf-pkg-config.d3742713161040dc06f12581b7c382adf6a4dec2d676d0515d10152e750b39f6
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+libarchive.fce0b89e2ff6ee39da7036d1a23cb801857e716dab2961ba44888cb6bec52f68
+#+libressl.cd8c8972c5fd319c44b2708144ca27ea42b323dd57d79ba4e631e52bcd30e275
+#+pkgconf-pkg-config.100f94e0a60eeae8adf1f3d33293786acf9b7cd06132d267a485368568cbcc4b
 #@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:.
 
 
diff --git a/variants/ccx-x86_64/zsh b/variants/ccx-x86_64/zsh
@@ -1,40 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+m4.0c844229567ffdfcd436bc4d8ac5e6a19154427bccc49379b4f855b1ed3ce7e1
-#+netbsd-curses.cb67e95c4d3ed170ad040e72827821a371ca90f6f9720876f485535f371fdcbf
-#+libbsd.3b0f54d166fd3693f380b98a48923052f743b9feeeddc6471f6275c5ec1da270
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+m4.3353c8ccf091da3cfebd3dae109d466a1467afb4d8a762db92a1e57b3bb70b1c
+#+netbsd-curses.9cdfd594c82da0452baa35a833e0b7ea5c740ba312d4a56a32855c7ee75435a6
+#+libbsd.ae8e1906e44376653d1b3e1596f04b0fab7bd5a1fb93fb657194ed8da733e292
 #@git:c73505cc47870bd09e8e204d98ac5976e0d4cb52:zsh_config
 #@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:.
 
diff --git a/variants/ccx-x86_64/zstd b/variants/ccx-x86_64/zstd
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9f8a8223348add8f60c5d4d08c599df381f1d56b1a79b69fb6e4bcf44e5ff650
-#+busybox-bzip2.1139d1b3d42d04cde0448b62da7ab6982832f087d4524dbe52972be8fbd5f367
-#+busybox-gzip.fd3b0eeb30c27c7e2371e8545fa2bafedbda2a24a4ed12b21901759c3a41fba1
-#+busybox-lzop.c219efeca7baf572162dcf34690907cc22ac70d60efda8d1577ec89c34539a4c
-#+busybox-unzip.32ad981ce692834e4a1f64d7f17b1ba98adc5c30f971e9f7402dc0b4ea0ee44d
-#+busybox-xz.3a36ad03ccfe295beb67fd1c9fb0c709f8ae53786415a8503fbb2f7e245a8825
-#+busybox-cpio.ac0030e11f55a563b8e24712159cbc316a4bc7dd9f5487b279d80b61433bd17a
-#+busybox-dpkg.019aa7baa5383ddda5c2aa28350bbaf2a939923f05be22f7b17262a3c9b8adbd
-#+busybox-rpm.87b9eeba9b2ae9ce5679903005ce45574a866c3ce13dfcabe2f865138f3d9163
-#+busybox-tar.7b48d7ee06efcdb13f8bcdc9ebbb491c3f6122e456fca9a24646f74196ef67e4
-#+busybox-ed.32662aa0b2ab65adb0ef7559ff8f5a39507f4eed89d778099d5856a93804d279
-#+busybox-sed.f4b98bb4a9f5d630638e22147dce3fb2bff2aa6f3ad080c8298631e1eb980b86
-#+busybox-vi.950220fc27809c6d6fe83bb4690a3a9cdf43cc89982a3d70942bb96d4b53ae5c
-#+busybox-xxd.e51c4e1187aa39f9b051f0c620e82fe68ce6c835df793882f4453ef710a005d3
-#+busybox-process-extra.982614dbc248e67152469bcefd6f3ed7570d9c3730c54dad46c3c280b425050d
-#+busybox-procps.3c7f1006aefa0c46596021a94c77174386c386fe10d7366f0314a2b14454ccb1
-#+busybox-psmisc.8a66f4ff2e7ac1bf01193c026fd0f4fa4ce4e65c273eca5f57c962df2d3a2b3e
-#+busybox-ash.c83db39d29b058edb987b05e2e8b4435a611f0e9bcf0480b7c8f7a492debd147
-#+busybox-bc.be4e0243f4ab4bdfe7ab35da202482adaae5636b3da0bcf1b9d6d3fe653c4d3c
-#+busybox-coreutils.64b42317232a01282c1e9ae22695e669a01f1df5feee8a094536dd1d77e10e12
-#+busybox-coreutils-extra.6ecbd32d2eb311a4c8d7e4c3081218f88c2a97c2765d937817b806f9701ce161
-#+busybox-daemontools.140e989a06f42f778094da687f67a96c21f1e7b66571dbec7527ff9a59fbd1a9
-#+busybox-grep.b6c2a953139c39698be8a5aaa3fbc2b24c1d7451b23cc53228b9c47453eee3a2
-#+busybox-misc.6e0df70fa549ffcbcaee147bd7a40209fa096c8e053482066fe67d3828313dbc
-#+busybox-sh.63ad2c31ab3e8cdc9c8d131968fc8ed1bb7f83c92bba8f458769023363eb85dd
-#+busybox-util-linux-unpriv.6beaf2962fa28ece4ceb64d371c42081e389cb9cd7dcee61b6a04e710e6d246c
-#+busybox-findutils.65c33fc4964d25caacdb9e68ae43a880e8557e614e1e915f3c250c4cad24b3fb
-#+busybox-awk.f70f4ea0c1636e6ec860f60832b6aa7d55ccee535fa0981148c9b1a72e663c4d
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.9ae80b9548a04069ae77b1db5163c69daa33947771c730f1ad689e75e53327ef
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.24b8735578814b1ef094147fc40bfa6eb9bd3db70c3d9afcdf594a20e0c47e9a
-#+busybox-diffutils.354b3980d8b39c29bd04c706812cbb62f668130c27414d39ac2824e649d44836
+#+busybox.6d9aaef5e97d0de350ea4c5a41ee2e5cd5904b5d6077f0618dc7d286f4b3df66
+#+busybox-bzip2.45e8d1d75b0c91072ee0b293f60357dd34bea68c6a0b3491527f5a32b5c0b347
+#+busybox-gzip.a07b5541fb2bafeb8810c86e2c4b699a1a2af62137d21e9d0d71c03a91635a74
+#+busybox-lzop.5f7305ef9b22c13b0699fcae9943ba95cb2f35b97fe2ce5127511f56fc6e63d0
+#+busybox-unzip.b84d38074162460625b7ae6dd25cfd09db07cb81360a93d315a9c1e5e7b2ec79
+#+busybox-xz.1fd36ddb53f82d8fae6672a9171769e51c31cf22801478fdd56221aaeeb7ce1d
+#+busybox-cpio.0421836ed5553599bdb2002e3a5bfe33339557bbcd94add4ae6e0972879c2ce5
+#+busybox-dpkg.58b5e73646f6d9b872dd80fa46962e0adfba5056a28841d85c1bdcec8a12cef0
+#+busybox-rpm.30a5f85bcdb46bdc4341b8ce9d759394c8ef54dcea5ff27a9ab27ea04122d7e1
+#+busybox-tar.5e5303509205f4155b10019a9b02204453fec1d8a46db5c572a1688e9b18c7dc
+#+busybox-ed.bbcd6f23e192ab649a9f360d7628b539aec62a0ce99dbc13c83cac3affdf61df
+#+busybox-sed.c71716065475a6b07b3a7ef7265e0e7d3c52e53d65ffa205576945a04d648e81
+#+busybox-vi.9390861f96259ae4482a298c1c64aa99a37e536be618aea486723e6485a0186c
+#+busybox-xxd.37f8c82e09ff755d9becac99230593b8150c6a76e55e55553e668146597deb40
+#+busybox-process-extra.73ab7f47e6fd0ff52ad5eb668ad2f2dd24c2d23368231a1488624da2fe6b6fea
+#+busybox-procps.12ed909e7e6082d2b43326caa13db36c1ad15111ad0900c79b58a9fc22aa6e1b
+#+busybox-psmisc.2ef0beba8746b100d5a0d2304ecf6620c1a9afc23f9663a3785e5ec8b5f97e2a
+#+busybox-ash.afb417c3ca593f161a6e050ae2cf58c25dac96bb0b44f67f4687734e11059d42
+#+busybox-bc.04af92436e63def3ee13131011fffd629db0bc8a1c3832b265d0fa21fb89d51e
+#+busybox-coreutils.c3bffc3a9bbfb824b37267c93c9fb9453e924811f7e58d2afb235b9c81280bef
+#+busybox-coreutils-extra.072e19919f6bd3868e7edc7f2cce0def7bdd6f23df72000c6bf245b9c56ff7d8
+#+busybox-daemontools.e0fe205066e671f250aa8e87bd48614b9b8291650ea3780de593558241aba033
+#+busybox-grep.989d05c561d304616b1bdb7b86f9ac788d6068f5e51562f774f8cd4c346251ca
+#+busybox-misc.e309f12d6757e46c7e99fa78e990c27474b2cd08742886c0aee1f5c3b7bcda83
+#+busybox-sh.34ca8c96563d48a58a24358775551632304e47d62d44a15ac6e11a7020a15a3b
+#+busybox-util-linux-unpriv.6d97cab6bfc7dae7a33be951d10c868cd29497f2aff26a7b20daeb7d801f5987
+#+busybox-findutils.d67449e3821aabeaaf6919d1e147d833b7cf2ddbb9cce49a6762d94607c92af8
+#+busybox-awk.a15159c110543a832e82ac3135206c0602440c502e8c0af8c5ea4883b0cf6cb5
+#+musl-cross-make.d8664e94ea59f0839a3c0fae15950a3869242cc5a7334b9fb4d4886489f23c28
+#+gnu-make.03d56817da573dc3ad076f5a44f3533fef723fe1b9a1e34af5b27238a3cecc4c
+#+busybox-diffutils.d3e8aa9da72c815e12147d8a2e386e457ee2a3f4100e79dd915cfdf95d183e59
 #@untar:-z:sha256:98e9c3d949d1b924e28e01eccb7deed865eefebf25c2f21c702e5cd5b63b85e1:.
 
 
diff --git a/variants/root-x86_64/aat b/variants/root-x86_64/aat
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+zsh.327d156100e047d8eeecfc7ccc6adf0e987c046293930c08b4fe0883c6d68983
-#+pthbs-banginstall.bcdce5af9233608b987295f2ed937c31fc00a74fd5aa14253d47cc21ace004ea
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+zsh.f093a067c8d91b8705b929d9c894f92946352174bd7f2d815431abb53a1485de
+#+pthbs-banginstall.71828bbb33047db02a8a5a77c75c03f2936be3714a9e5ce4f827f204fd641533
 #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat
 
 
diff --git a/variants/root-x86_64/abduco b/variants/root-x86_64/abduco
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
 #@git:8c32909a159aaa9484c82b71f05b7a73321eb491:abduco
 
 
diff --git a/variants/root-x86_64/alpine-keys b/variants/root-x86_64/alpine-keys
@@ -1,32 +1,32 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
 #@git:c7b36ed27103ee3f9aa01905ba1fac2d606079cf:alpine-keys
 
 
diff --git a/variants/root-x86_64/apk-tools b/variants/root-x86_64/apk-tools
@@ -1,41 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+patch.257395a41b2f69d0f903104f1c9853be8c9f5fc06526da68ab358bc1be11d61a
-#+libressl.38a57d0a723d44b51732f8f0a130dc427259f0a14242a9d27cd2a8ca2375256c
-#+zstd.c6ec354ea78537add9e8d82140cc06feb56411df9e401d2ef1043468768a7780
-#+pkgconf-pkg-config.0bd26bb5368082438ebcaae7551b1454a03981fc8d8ee799d48d834a26aee1ec
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+patch.2cfd03acd16d0d89685bd0c80dc9fcacb2f3f9802eb0e4011a1af6549f1e08b1
+#+libressl.3268ed19558e6e83802d9a8a91b45387bcdc8ba859a3c76025317984bfd4d6c3
+#+zstd.0fa40e39da3442c34d2afde37dc16288ed90ad6c54cbb77b93a120ef10df712e
+#+pkgconf-pkg-config.8e5c8881361e43bcf5473fa80e75f7aff454d13f9a951d65b42d0d279d6d52bc
 #@sha256:4b32a05f12c3d29befb210c88c415f7c7affd7e351b9e96b0cfde50773d22dbd:apk-tools.patch
 #@git:9d074efdc12bc41b5d24190595a5269a770e852a:apk-tools
 
diff --git a/variants/root-x86_64/applyuidgid-caps b/variants/root-x86_64/applyuidgid-caps
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+skalibs.6afe334a070e1566d76daee15d00171a6f6a99f1752e88a80d04378a585dfa77
-#+libcap.af7837f04e1b8914be888ac898e2254c463e29db71397a3945044078a12de259
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+skalibs.069d912bafcaf66a7702f7e9f011cee986805a343f48a310b6358f066a25e2b3
+#+libcap.978d71a77c9256c0e2187ae8d62922216b7411d4a5f17d2896628c732db4df11
 #@sha256:818a5ad7061ab1a740a5c2e7d7d8cdcc7be7e84e3f04b479731cf94ff1f1d093:applyuidgid-caps.c
 
 
diff --git a/variants/root-x86_64/argp-standalone b/variants/root-x86_64/argp-standalone
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+m4.27f0a202490d82b1635b7cb459d4b9673a51d756911654acf07fe347f47eea0b
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+m4.4ae4e28c98413d9ffde8b4aa5f50af10935690f4a459ad8d7005ebb7299e8767
 #@untar:-z:sha256:c29eae929dfebd575c38174f2c8c315766092cec99a8f987569d0cad3c6d64f6:.
 #@untar::sha256:a4facc0856b512ad8ab5aed7b07e14a9629aaf042b1e92377ba22fcfc4c4205b:argp-standalone-1.5.0
 
diff --git a/variants/root-x86_64/attr b/variants/root-x86_64/attr
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+m4.27f0a202490d82b1635b7cb459d4b9673a51d756911654acf07fe347f47eea0b
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+m4.4ae4e28c98413d9ffde8b4aa5f50af10935690f4a459ad8d7005ebb7299e8767
 #@untar:-z:sha256:39bf67452fa41d0948c2197601053f48b3d78a029389734332a6309a680c6c87:.
 
 
diff --git a/variants/root-x86_64/bison b/variants/root-x86_64/bison
@@ -1,39 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+m4.27f0a202490d82b1635b7cb459d4b9673a51d756911654acf07fe347f47eea0b
-#+flex.d134786b76d557c083764809f126b4b87622d65686b721dd4265e8153af0ad8b
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+m4.4ae4e28c98413d9ffde8b4aa5f50af10935690f4a459ad8d7005ebb7299e8767
+#+flex.18feadf9d7f890bdc4c3e5417bdf1a8afeb229f1c96901651a515f6f5f2124d4
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
 
diff --git a/variants/root-x86_64/busybox b/variants/root-x86_64/busybox
@@ -1,7 +1,5 @@
 #!/usr/bin/env pthbs-build
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
 #+gnu-make.e4a639067dbdc87f724a0af3861ce3ec1fc8d2ad5046d28f7e687b5ac6e9cc7e
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
 #@sha256:31b8f61d2173fa36d4409e8e91f52088691d6ba4db13efe19ea7ae7512e64275:busybox/.config
diff --git a/variants/root-x86_64/busybox-ash b/variants/root-x86_64/busybox-ash
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-attr b/variants/root-x86_64/busybox-attr
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-awk b/variants/root-x86_64/busybox-awk
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-bc b/variants/root-x86_64/busybox-bc
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-bzip2 b/variants/root-x86_64/busybox-bzip2
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-chpst b/variants/root-x86_64/busybox-chpst
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-console b/variants/root-x86_64/busybox-console
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-coreutils b/variants/root-x86_64/busybox-coreutils
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-coreutils-extra b/variants/root-x86_64/busybox-coreutils-extra
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-cpio b/variants/root-x86_64/busybox-cpio
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-cron b/variants/root-x86_64/busybox-cron
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-daemontools b/variants/root-x86_64/busybox-daemontools
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-diffutils b/variants/root-x86_64/busybox-diffutils
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-dosfstools b/variants/root-x86_64/busybox-dosfstools
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-dpkg b/variants/root-x86_64/busybox-dpkg
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-e2fsprogs b/variants/root-x86_64/busybox-e2fsprogs
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-ed b/variants/root-x86_64/busybox-ed
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-findutils b/variants/root-x86_64/busybox-findutils
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-getty b/variants/root-x86_64/busybox-getty
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-grep b/variants/root-x86_64/busybox-grep
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-gzip b/variants/root-x86_64/busybox-gzip
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-i2c-tools b/variants/root-x86_64/busybox-i2c-tools
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-iproute2 b/variants/root-x86_64/busybox-iproute2
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-iputils b/variants/root-x86_64/busybox-iputils
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-kbd b/variants/root-x86_64/busybox-kbd
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-linux-extra b/variants/root-x86_64/busybox-linux-extra
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-logging b/variants/root-x86_64/busybox-logging
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-login b/variants/root-x86_64/busybox-login
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-lzop b/variants/root-x86_64/busybox-lzop
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-misc b/variants/root-x86_64/busybox-misc
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-modutils b/variants/root-x86_64/busybox-modutils
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-mtd-utils b/variants/root-x86_64/busybox-mtd-utils
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-net-misc b/variants/root-x86_64/busybox-net-misc
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-net-tools b/variants/root-x86_64/busybox-net-tools
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-process-extra b/variants/root-x86_64/busybox-process-extra
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-procps b/variants/root-x86_64/busybox-procps
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-psmisc b/variants/root-x86_64/busybox-psmisc
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-rpm b/variants/root-x86_64/busybox-rpm
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-sed b/variants/root-x86_64/busybox-sed
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-sh b/variants/root-x86_64/busybox-sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-shadow b/variants/root-x86_64/busybox-shadow
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-su b/variants/root-x86_64/busybox-su
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-tar b/variants/root-x86_64/busybox-tar
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-traceroute b/variants/root-x86_64/busybox-traceroute
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-unzip b/variants/root-x86_64/busybox-unzip
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-util-linux-priv b/variants/root-x86_64/busybox-util-linux-priv
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-util-linux-unpriv b/variants/root-x86_64/busybox-util-linux-unpriv
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-vi b/variants/root-x86_64/busybox-vi
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-wget b/variants/root-x86_64/busybox-wget
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-xxd b/variants/root-x86_64/busybox-xxd
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-xz b/variants/root-x86_64/busybox-xz
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/ca-certificates-wip-donotuse b/variants/root-x86_64/ca-certificates-wip-donotuse
@@ -1,33 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+certdata2pem.608317b59e5823441586002d1dadeee061537308e8b3460a4317534c08676ae3
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+certdata2pem.0a6e10c22cceefc7d79acf32cb591703dedbf1e832116295c4e22da2079491b2
 #@untar:-j:sha256:6ef7bc56cc0e0b307d99a3c494119686091cc1d4ad08986d68aa089dd00c7788:.
 
 
diff --git a/variants/root-x86_64/ccx-utils b/variants/root-x86_64/ccx-utils
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+skalibs.6afe334a070e1566d76daee15d00171a6f6a99f1752e88a80d04378a585dfa77
-#+s6.bc027c0b76a325e17e0f7392c2756257d7c8b758c960430f116c4bd87038d5a2
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+skalibs.069d912bafcaf66a7702f7e9f011cee986805a343f48a310b6358f066a25e2b3
+#+s6.88f5178c72bb586930f096007d40023594e9e22e4ce60486295b861230d6141c
 #@git:461a9ec198c1e2b9c39a34e21786747dbb8671b4:ccx-utils
 
 
diff --git a/variants/root-x86_64/certdata2pem b/variants/root-x86_64/certdata2pem
@@ -1,35 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
 #@sha256:064f7d41106cd9efa08b9e68cf049f44e3be55666bd2ab96d02c508293b8dce7:certdata2pem.c
 
 
diff --git a/variants/root-x86_64/confz b/variants/root-x86_64/confz
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+zsh.327d156100e047d8eeecfc7ccc6adf0e987c046293930c08b4fe0883c6d68983
-#+pthbs-banginstall.bcdce5af9233608b987295f2ed937c31fc00a74fd5aa14253d47cc21ace004ea
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+zsh.f093a067c8d91b8705b929d9c894f92946352174bd7f2d815431abb53a1485de
+#+pthbs-banginstall.71828bbb33047db02a8a5a77c75c03f2936be3714a9e5ce4f827f204fd641533
 #@git:c6aef8098d37a1773439117a5674bfc8662ef62b:confz
 
 
diff --git a/variants/root-x86_64/container-bin-image b/variants/root-x86_64/container-bin-image
@@ -1,60 +1,60 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-dosfstools.51ae6c1b897b61a65e52fe1867ebaeb2b7129e3b2b00e1118651d9bd011fc0e7
-#+busybox-e2fsprogs.57511c62d2721493f67d82e7465c20bc041f9b7642350f408d8a9498b4ae6b1f
-#+busybox-iproute2.ae76a929509894a9042994f88a9bfbd499d2589a48a68017f29e2af24cbf1b58
-#+busybox-iputils.2f1e875a68289723897606a0fcb921d38bc67b14707a78e18b1de8d91005cda4
-#+busybox-net-misc.de2f5c6384b8e8c70a1c2ad6d027ad0c50109ea95c649297f55257f2736aff84
-#+busybox-net-tools.f7c055b657de06ef2bf81f6402afe78a9e89addf12956f66fa7ebfbe26ef3222
-#+busybox-traceroute.e46d0e67d086c1a195ed0763bb52e9a74f06d28aeaf1a1c746bb17bfa0e2ca9b
-#+busybox-wget.a9e82d6bfedd9d0efec6d8bad11a5ccc50c01f96df7b23f0a9348aacd07dd78f
-#+busybox-chpst.4e4af9a70d109f6c2959c89b2e3cd577a382dec26e165631eaf00ee8f309113a
-#+busybox-console.fe9161b5896d9c52ead9d9ac22702036ed0573f9825c6221d3b39fca0834a2b1
-#+busybox-getty.c9e6d1b5f90374377bbc86c725af4589ab8da489a44a9ed485bcee2588222dc6
-#+busybox-i2c-tools.1ced7e745272b49a031cd14d8bb7b159018576f73e68601d6577215d3afbb9e7
-#+busybox-linux-extra.a4daaefe0a8f448bc4acf27e5de328de4611093ec3462fcf073d84c8761800e7
-#+busybox-mtd-utils.def4ab7f42c38ee13602f92e1d1c71c363f10f5aafb11dbb7e2b77541fc6202d
-#+busybox-shadow.51dae647f5d67da7ddef7413dc3b664f0c958cb99b9a0a4fe651b81be13d48b6
-#+busybox-su.124cfc7487bd56030e786be3207217deec1aea7026d2d9ba2866d97919ceae53
-#+busybox-util-linux-priv.2fa8487f5bb7412433c285282acd00857a6406b5f1aeb8eb94f733201f38b3e6
-#+busybox-logging.4b8f2db51b1c133dcb116b129f70c42b0235be90a5b93319db5653cf44cb00d5
-#+busybox-cron.7242ab370d42aefd0899d346a4fe14c4d42b1e4666ceb448a70b5f759a2e8c5c
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-login.7297a24cf5516daa4e1444f0de75afa387b259e12f62a6a86ad2db42eca9cbbd
-#+execline.2dab6919e5c6a8d2bbcf40f011bf2c0865fffc8c9f2f761a492304a4597193a7
-#+s6.bc027c0b76a325e17e0f7392c2756257d7c8b758c960430f116c4bd87038d5a2
-#+ccx-utils.e86caf5af7cfef9e19b6378975368bb3e3cb9975289d9757509dd5a81e27c228
-#+applyuidgid-caps.9b8d6d1e6d645b4766e2b4b4048c3fd084dd3697f221ec4b3d4e4a7ea98b4f0f
-#+easyseccomp.62abc0415ef11eda154522ff8ed19b041de02c007794fb01bb542f2000ff5f73
-#+mlog.b386be229184abe7b741bf232a9d346291f79b7ec07053b22a6053c1f17106ca
-#+abduco.f67625b3f69fb39705bdc61d65acf38226973bb72d927d695c06855257144745
-#+nawk.78c5902874518e02880ef4bad71e8db0bc9519f111546bb8d27e8127aa279ab6
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-dosfstools.b0181361412ee80b8fbdeaf2de8c88abefb186161e14c99b3d2648951b294fe9
+#+busybox-e2fsprogs.709b765c4fc220a61c01e5aadb8b41bcd49906a5f0c8ee421d006567dc8121d3
+#+busybox-iproute2.e1c214fc23b2d5d41561b96ae1b0303b53c0804013d66478b12e0d1d34c5e0d9
+#+busybox-iputils.2bab9fbef05e48e219d19d533e8e86cbd68d21dacd1f4bce089cf24cacfe34bf
+#+busybox-net-misc.ae70546784dc33051eec77b83f9cf60fb97f3185af016e372a24ce9f078c77a7
+#+busybox-net-tools.07e53b619ee6dcafac7325ca15c095086f107d15d788c722a1d408ac50f6d0ca
+#+busybox-traceroute.502ef0a4f41187e629a32161c3b8ace008768dcfa98ea8122dd25e5ac61598ab
+#+busybox-wget.4cb39f7f861f581e7d3c6cc9ae93aa77671b626ffabae3d4a73a2d965445e0c7
+#+busybox-chpst.c5f6784b9b7fd6fba34266d08f882752f01a59f68634cdafe5c7760982f95fb7
+#+busybox-console.a0fa6ea977606c6ed873ea9132a87c4f914f6df5c4e298fa5c808c2fd3d3e131
+#+busybox-getty.9c1fff8e7a25032b557d06a0c8375ec44b7d6e0086d3b87dddb67603d79bc021
+#+busybox-i2c-tools.a616cc21a2b196044f0feb186394fcd616401c20b8f5dae9531a05117deb2880
+#+busybox-linux-extra.6e7b9586add776b2876b84a25401b43b99a4de1a16b849a1d9d77c115d2e2ffa
+#+busybox-mtd-utils.53c25959689167a04e532117e89e8d530779b1c41a0bf164cf97f54ce4eac258
+#+busybox-shadow.5222fc3744f686acbe55485b3fea2a496811c930531b3f80a8917b1efbe8c7b7
+#+busybox-su.af59f292f440c415615f599540d498fb30b66d145fb292faddc93cd297d83b3d
+#+busybox-util-linux-priv.fa7c738761e017bbdeade7ef0d4fcf50cc61fffa5e3ab6da5827ce61e8f39ebb
+#+busybox-logging.8e56e9820e6c7dc0a7256bbb153f82b08a1e2a5f9e87165d2fe98e8b1767a648
+#+busybox-cron.d04a4c03f7b1f674d35f71b1d30d0c76b378d3a7b9d4acedd583b8fb2c1e294b
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-login.76f1f0db9457d966cb110a984e25bf15af72024c6b5210ab0872c5d2611b3557
+#+execline.35dcb24605d37b6008fce8c9a796d579eb71c2b8fdd5f98f7facd1e9269b8337
+#+s6.88f5178c72bb586930f096007d40023594e9e22e4ce60486295b861230d6141c
+#+ccx-utils.060f7e168f078cdfdf66be335af7b653e99efe25a8bfc2f060c67dc40f65985a
+#+applyuidgid-caps.696bad813e560742aad37d71466e3703bf2eddc9886f052cdb7bbc64b55f65d1
+#+easyseccomp.cd975d1addf7c327a95f4f888b90f01c0db3060a42ef4f8078e17e1b0c2711ae
+#+mlog.d1a0d0432092e86b4985cd44454841378ac7e4c3549e83f0a10d70d29a1c0a40
+#+abduco.6e5203a5b17188a05990171a1dd4fe7e2bba15b872b6773c9381b53dc75fb67e
+#+nawk.6fef16603f8152ffa26c1752689b1976932bc9312b681e2d543a309db3d5f522
 #@sha256:b9236c0fd504ffbc56f65d0522d2acadcd2683380eaa6f1873e8201eaa7388a5:default-policy.easyseccomp
 
 img="$pthbs_destdir/versions/$pthbs_package/container-bin-image"
diff --git a/variants/root-x86_64/containers b/variants/root-x86_64/containers
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+zsh.327d156100e047d8eeecfc7ccc6adf0e987c046293930c08b4fe0883c6d68983
-#+pthbs-banginstall.bcdce5af9233608b987295f2ed937c31fc00a74fd5aa14253d47cc21ace004ea
-#+execline.2dab6919e5c6a8d2bbcf40f011bf2c0865fffc8c9f2f761a492304a4597193a7
-#+alpine-keys.04c133f914dd65a44351faaa766a1d36ae98ae092d5bda274ebec05ec3f74b67
-#+apk-tools.e04ee1e5428558bde1ca9d3c46b29328be14ced4c417385c61863920ad73cb49
-#+xbps.c0d1ba5ccaf97cc331c617e357589ff230832641ea138afd2b5957bbccef9d20
-#+container-bin-image.070a501c23e6f9baca9ab60a90f78fa37da13d6f141be8008e67d4b2f9432296
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+zsh.f093a067c8d91b8705b929d9c894f92946352174bd7f2d815431abb53a1485de
+#+pthbs-banginstall.71828bbb33047db02a8a5a77c75c03f2936be3714a9e5ce4f827f204fd641533
+#+execline.35dcb24605d37b6008fce8c9a796d579eb71c2b8fdd5f98f7facd1e9269b8337
+#+alpine-keys.f1f8c8a1ea5b5ca18e8ff7cf9d69caeca3c8a4a30342f5189049baebf4713931
+#+apk-tools.209b79078e3a2fe8315e3daa561a853e3ee8649a2b612ea0693b674bec4ec3fb
+#+xbps.d4a879631e49c4778f7e3d01af68d042569ed18a07db8e1bdc5af0c891e2ebff
+#+container-bin-image.17bb1973c9a1d1e86094d09dbe9e18007491f2cc4f6f90d356a03c77226c599c
 #@git:9820dbea1cf5060d7d04632f0fed7e91ea608309:containers
 
 
@@ -76,10 +76,10 @@ printf '%s\n' >"${dest}/zsh/site-functions/confz_containers_pthbs_init" \
 	"typeset -g container_xbps_install_executable='$prefix/deps/command/xbps-install.static'"
 
 mkdir -p "${dest}/deps/command"
-ln -sf '/versions/apk-tools.e04ee1e5428558bde1ca9d3c46b29328be14ced4c417385c61863920ad73cb49/command/apk.static' "${dest}/deps/command/"
-ln -sf '/versions/xbps.c0d1ba5ccaf97cc331c617e357589ff230832641ea138afd2b5957bbccef9d20/command/xbps-install.static' "${dest}/deps/command/"
+ln -sf '/versions/apk-tools.209b79078e3a2fe8315e3daa561a853e3ee8649a2b612ea0693b674bec4ec3fb/command/apk.static' "${dest}/deps/command/"
+ln -sf '/versions/xbps.d4a879631e49c4778f7e3d01af68d042569ed18a07db8e1bdc5af0c891e2ebff/command/xbps-install.static' "${dest}/deps/command/"
 
-for f in '/versions/alpine-keys.04c133f914dd65a44351faaa766a1d36ae98ae092d5bda274ebec05ec3f74b67'/keys/alpine/*/*; do
+for f in '/versions/alpine-keys.f1f8c8a1ea5b5ca18e8ff7cf9d69caeca3c8a4a30342f5189049baebf4713931'/keys/alpine/*/*; do
 	test -f "$f"
 	d=$(basename "${f%/*}")
 	mkdir -p "${dest}/deps/keys/alpine/$d"
@@ -87,13 +87,13 @@ for f in '/versions/alpine-keys.04c133f914dd65a44351faaa766a1d36ae98ae092d5bda27
 done
  
 mkdir -p "${dest}/deps/keys/void"
-for f in '/versions/xbps.c0d1ba5ccaf97cc331c617e357589ff230832641ea138afd2b5957bbccef9d20'/keys/void/*; do
+for f in '/versions/xbps.d4a879631e49c4778f7e3d01af68d042569ed18a07db8e1bdc5af0c891e2ebff'/keys/void/*; do
 	ln -sf "$f" "${dest}/deps/keys/void/"
 done
 
-test -d '/versions/container-bin-image.070a501c23e6f9baca9ab60a90f78fa37da13d6f141be8008e67d4b2f9432296/container-bin-image'
-test -f '/versions/container-bin-image.070a501c23e6f9baca9ab60a90f78fa37da13d6f141be8008e67d4b2f9432296/container-bin-image/if'
-ln -sf '/versions/container-bin-image.070a501c23e6f9baca9ab60a90f78fa37da13d6f141be8008e67d4b2f9432296/container-bin-image' "${dest}/deps/"
+test -d '/versions/container-bin-image.17bb1973c9a1d1e86094d09dbe9e18007491f2cc4f6f90d356a03c77226c599c/container-bin-image'
+test -f '/versions/container-bin-image.17bb1973c9a1d1e86094d09dbe9e18007491f2cc4f6f90d356a03c77226c599c/container-bin-image/if'
+ln -sf '/versions/container-bin-image.17bb1973c9a1d1e86094d09dbe9e18007491f2cc4f6f90d356a03c77226c599c/container-bin-image' "${dest}/deps/"
  
 
 
diff --git a/variants/root-x86_64/containers.environment b/variants/root-x86_64/containers.environment
@@ -1,64 +1,64 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-dosfstools.51ae6c1b897b61a65e52fe1867ebaeb2b7129e3b2b00e1118651d9bd011fc0e7
-#+busybox-e2fsprogs.57511c62d2721493f67d82e7465c20bc041f9b7642350f408d8a9498b4ae6b1f
-#+busybox-iproute2.ae76a929509894a9042994f88a9bfbd499d2589a48a68017f29e2af24cbf1b58
-#+busybox-iputils.2f1e875a68289723897606a0fcb921d38bc67b14707a78e18b1de8d91005cda4
-#+busybox-net-misc.de2f5c6384b8e8c70a1c2ad6d027ad0c50109ea95c649297f55257f2736aff84
-#+busybox-net-tools.f7c055b657de06ef2bf81f6402afe78a9e89addf12956f66fa7ebfbe26ef3222
-#+busybox-traceroute.e46d0e67d086c1a195ed0763bb52e9a74f06d28aeaf1a1c746bb17bfa0e2ca9b
-#+busybox-wget.a9e82d6bfedd9d0efec6d8bad11a5ccc50c01f96df7b23f0a9348aacd07dd78f
-#+busybox-chpst.4e4af9a70d109f6c2959c89b2e3cd577a382dec26e165631eaf00ee8f309113a
-#+busybox-console.fe9161b5896d9c52ead9d9ac22702036ed0573f9825c6221d3b39fca0834a2b1
-#+busybox-getty.c9e6d1b5f90374377bbc86c725af4589ab8da489a44a9ed485bcee2588222dc6
-#+busybox-i2c-tools.1ced7e745272b49a031cd14d8bb7b159018576f73e68601d6577215d3afbb9e7
-#+busybox-linux-extra.a4daaefe0a8f448bc4acf27e5de328de4611093ec3462fcf073d84c8761800e7
-#+busybox-mtd-utils.def4ab7f42c38ee13602f92e1d1c71c363f10f5aafb11dbb7e2b77541fc6202d
-#+busybox-shadow.51dae647f5d67da7ddef7413dc3b664f0c958cb99b9a0a4fe651b81be13d48b6
-#+busybox-su.124cfc7487bd56030e786be3207217deec1aea7026d2d9ba2866d97919ceae53
-#+busybox-util-linux-priv.2fa8487f5bb7412433c285282acd00857a6406b5f1aeb8eb94f733201f38b3e6
-#+busybox-logging.4b8f2db51b1c133dcb116b129f70c42b0235be90a5b93319db5653cf44cb00d5
-#+busybox-cron.7242ab370d42aefd0899d346a4fe14c4d42b1e4666ceb448a70b5f759a2e8c5c
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+execline.2dab6919e5c6a8d2bbcf40f011bf2c0865fffc8c9f2f761a492304a4597193a7
-#+s6.bc027c0b76a325e17e0f7392c2756257d7c8b758c960430f116c4bd87038d5a2
-#+s6-portable-utils.e9bd90a169690c6f092143e5e577f27117cbdcdb19d0f8bea39638c4aa3d765c
-#+s6-linux-utils.12dcc381cb5fef3994ae191797e7373cea55df7e4e4564d697f5465039850aad
-#+zsh.327d156100e047d8eeecfc7ccc6adf0e987c046293930c08b4fe0883c6d68983
-#+confz.fadcbca8051d36890bbdb3a787efcbd154b62046da3607a9b361cce7907176e4
-#+containers.500f4fb71e330d72f40aa66e1dd3074afbef037af1d02f62872b041484245eb3
-#+xbps.c0d1ba5ccaf97cc331c617e357589ff230832641ea138afd2b5957bbccef9d20
-#+zstd.c6ec354ea78537add9e8d82140cc06feb56411df9e401d2ef1043468768a7780
-#+apk-tools.e04ee1e5428558bde1ca9d3c46b29328be14ced4c417385c61863920ad73cb49
-#+alpine-keys.04c133f914dd65a44351faaa766a1d36ae98ae092d5bda274ebec05ec3f74b67
-#+getent.308c5e84e6153460a029b2a80b660d653634146ec1f83c30d28e1501be925b3e
-#+fileset.5378d994f1355b0c64fb608929dc43f2e30df1ba91f8db80eca7fc9d9ecd3f9c
-#+ccx-utils.e86caf5af7cfef9e19b6378975368bb3e3cb9975289d9757509dd5a81e27c228
-#+easyseccomp.62abc0415ef11eda154522ff8ed19b041de02c007794fb01bb542f2000ff5f73
-#+findutils.35709e9badd93cf847be4b7f7e01b6bfe5a1971db097c44d53973067ea43b375
-#+nawk.78c5902874518e02880ef4bad71e8db0bc9519f111546bb8d27e8127aa279ab6-
\ No newline at end of file
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-dosfstools.b0181361412ee80b8fbdeaf2de8c88abefb186161e14c99b3d2648951b294fe9
+#+busybox-e2fsprogs.709b765c4fc220a61c01e5aadb8b41bcd49906a5f0c8ee421d006567dc8121d3
+#+busybox-iproute2.e1c214fc23b2d5d41561b96ae1b0303b53c0804013d66478b12e0d1d34c5e0d9
+#+busybox-iputils.2bab9fbef05e48e219d19d533e8e86cbd68d21dacd1f4bce089cf24cacfe34bf
+#+busybox-net-misc.ae70546784dc33051eec77b83f9cf60fb97f3185af016e372a24ce9f078c77a7
+#+busybox-net-tools.07e53b619ee6dcafac7325ca15c095086f107d15d788c722a1d408ac50f6d0ca
+#+busybox-traceroute.502ef0a4f41187e629a32161c3b8ace008768dcfa98ea8122dd25e5ac61598ab
+#+busybox-wget.4cb39f7f861f581e7d3c6cc9ae93aa77671b626ffabae3d4a73a2d965445e0c7
+#+busybox-chpst.c5f6784b9b7fd6fba34266d08f882752f01a59f68634cdafe5c7760982f95fb7
+#+busybox-console.a0fa6ea977606c6ed873ea9132a87c4f914f6df5c4e298fa5c808c2fd3d3e131
+#+busybox-getty.9c1fff8e7a25032b557d06a0c8375ec44b7d6e0086d3b87dddb67603d79bc021
+#+busybox-i2c-tools.a616cc21a2b196044f0feb186394fcd616401c20b8f5dae9531a05117deb2880
+#+busybox-linux-extra.6e7b9586add776b2876b84a25401b43b99a4de1a16b849a1d9d77c115d2e2ffa
+#+busybox-mtd-utils.53c25959689167a04e532117e89e8d530779b1c41a0bf164cf97f54ce4eac258
+#+busybox-shadow.5222fc3744f686acbe55485b3fea2a496811c930531b3f80a8917b1efbe8c7b7
+#+busybox-su.af59f292f440c415615f599540d498fb30b66d145fb292faddc93cd297d83b3d
+#+busybox-util-linux-priv.fa7c738761e017bbdeade7ef0d4fcf50cc61fffa5e3ab6da5827ce61e8f39ebb
+#+busybox-logging.8e56e9820e6c7dc0a7256bbb153f82b08a1e2a5f9e87165d2fe98e8b1767a648
+#+busybox-cron.d04a4c03f7b1f674d35f71b1d30d0c76b378d3a7b9d4acedd583b8fb2c1e294b
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+execline.35dcb24605d37b6008fce8c9a796d579eb71c2b8fdd5f98f7facd1e9269b8337
+#+s6.88f5178c72bb586930f096007d40023594e9e22e4ce60486295b861230d6141c
+#+s6-portable-utils.b9bda7b30d532a39d5663110b7541a7242d71c5908ef45fa0bb8f0727ecf5c7f
+#+s6-linux-utils.d3cf43fae32e55ab9e4096d5a340eabb95ef48ac2ad0d4f2ebf203d182b0099c
+#+zsh.f093a067c8d91b8705b929d9c894f92946352174bd7f2d815431abb53a1485de
+#+confz.40f3ebf52896f6a22b670d1f88618ab80acb7b6f8f001e7c7d66cae2cbb2beb2
+#+containers.948b0d7db1d3eba9d22c692fa2673ffdd9e732aa18357d75264424d4d58f5ae2
+#+xbps.d4a879631e49c4778f7e3d01af68d042569ed18a07db8e1bdc5af0c891e2ebff
+#+zstd.0fa40e39da3442c34d2afde37dc16288ed90ad6c54cbb77b93a120ef10df712e
+#+apk-tools.209b79078e3a2fe8315e3daa561a853e3ee8649a2b612ea0693b674bec4ec3fb
+#+alpine-keys.f1f8c8a1ea5b5ca18e8ff7cf9d69caeca3c8a4a30342f5189049baebf4713931
+#+getent.7ec91acdc0b635eb7b6d4a4426ea49a92c28ea645be9f69e79807531a0e47973
+#+fileset.9d268386c0971bf6812475860e281506d8e3df5f13bf0fe698031e2bb5cb9946
+#+ccx-utils.060f7e168f078cdfdf66be335af7b653e99efe25a8bfc2f060c67dc40f65985a
+#+easyseccomp.cd975d1addf7c327a95f4f888b90f01c0db3060a42ef4f8078e17e1b0c2711ae
+#+findutils.98530703c3d88a35fdf650055f75ff7e9c18174ab9a91bf6447603cc7b5bffe4
+#+nawk.6fef16603f8152ffa26c1752689b1976932bc9312b681e2d543a309db3d5f522+
\ No newline at end of file
diff --git a/variants/root-x86_64/curl b/variants/root-x86_64/curl
@@ -1,39 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+m4.27f0a202490d82b1635b7cb459d4b9673a51d756911654acf07fe347f47eea0b
-#+libressl.38a57d0a723d44b51732f8f0a130dc427259f0a14242a9d27cd2a8ca2375256c
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+m4.4ae4e28c98413d9ffde8b4aa5f50af10935690f4a459ad8d7005ebb7299e8767
+#+libressl.3268ed19558e6e83802d9a8a91b45387bcdc8ba859a3c76025317984bfd4d6c3
 #@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:.
 
 
diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment
@@ -1,99 +1,97 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-dosfstools.51ae6c1b897b61a65e52fe1867ebaeb2b7129e3b2b00e1118651d9bd011fc0e7
-#+busybox-e2fsprogs.57511c62d2721493f67d82e7465c20bc041f9b7642350f408d8a9498b4ae6b1f
-#+busybox-iproute2.ae76a929509894a9042994f88a9bfbd499d2589a48a68017f29e2af24cbf1b58
-#+busybox-iputils.2f1e875a68289723897606a0fcb921d38bc67b14707a78e18b1de8d91005cda4
-#+busybox-net-misc.de2f5c6384b8e8c70a1c2ad6d027ad0c50109ea95c649297f55257f2736aff84
-#+busybox-net-tools.f7c055b657de06ef2bf81f6402afe78a9e89addf12956f66fa7ebfbe26ef3222
-#+busybox-traceroute.e46d0e67d086c1a195ed0763bb52e9a74f06d28aeaf1a1c746bb17bfa0e2ca9b
-#+busybox-wget.a9e82d6bfedd9d0efec6d8bad11a5ccc50c01f96df7b23f0a9348aacd07dd78f
-#+busybox-chpst.4e4af9a70d109f6c2959c89b2e3cd577a382dec26e165631eaf00ee8f309113a
-#+busybox-console.fe9161b5896d9c52ead9d9ac22702036ed0573f9825c6221d3b39fca0834a2b1
-#+busybox-getty.c9e6d1b5f90374377bbc86c725af4589ab8da489a44a9ed485bcee2588222dc6
-#+busybox-i2c-tools.1ced7e745272b49a031cd14d8bb7b159018576f73e68601d6577215d3afbb9e7
-#+busybox-linux-extra.a4daaefe0a8f448bc4acf27e5de328de4611093ec3462fcf073d84c8761800e7
-#+busybox-mtd-utils.def4ab7f42c38ee13602f92e1d1c71c363f10f5aafb11dbb7e2b77541fc6202d
-#+busybox-shadow.51dae647f5d67da7ddef7413dc3b664f0c958cb99b9a0a4fe651b81be13d48b6
-#+busybox-su.124cfc7487bd56030e786be3207217deec1aea7026d2d9ba2866d97919ceae53
-#+busybox-util-linux-priv.2fa8487f5bb7412433c285282acd00857a6406b5f1aeb8eb94f733201f38b3e6
-#+busybox-logging.4b8f2db51b1c133dcb116b129f70c42b0235be90a5b93319db5653cf44cb00d5
-#+busybox-cron.7242ab370d42aefd0899d346a4fe14c4d42b1e4666ceb448a70b5f759a2e8c5c
-#+attr.1e6f32b65a71bc6b684d9fc74ec71f0435ca24d4e79b62b098ff52596d10d208
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+diffutils.a121b3cebda43b7cf8f0a8772b8e7af487aa8749a9d8359f267adda0e6c1744c
-#+patch.257395a41b2f69d0f903104f1c9853be8c9f5fc06526da68ab358bc1be11d61a
-#+flex.d134786b76d557c083764809f126b4b87622d65686b721dd4265e8153af0ad8b
-#+bison.66947d10baf6f9f669c4bdb21dd7d808b01a4f1795910294166b37b3ca99863f
-#+rsync.abb640b022ca32a19a7323211846022ec3e9b6d90379565df2f72c9f1f7e3851
-#+execline.2dab6919e5c6a8d2bbcf40f011bf2c0865fffc8c9f2f761a492304a4597193a7
-#+s6.bc027c0b76a325e17e0f7392c2756257d7c8b758c960430f116c4bd87038d5a2
-#+s6-rc.f275c9b2ec0786d19935ee6bd53012974c3205699f52dfa76b8ce75dbe5768bb
-#+s6-portable-utils.e9bd90a169690c6f092143e5e577f27117cbdcdb19d0f8bea39638c4aa3d765c
-#+s6-linux-utils.12dcc381cb5fef3994ae191797e7373cea55df7e4e4564d697f5465039850aad
-#+s6-linux-init.1d7478793eb38023d64a3220182dec7e15ad664891aece6d4120011b87d9dddc
-#+mdevd.bff4a945d357beb45c35b039c90fe64ce9b8f79edf9f3598af9f093be68ea991
-#+s6-dns.5dc351415b1ff8258bc90eabf498b9d694d2d8526a65f2586d416dd21462c341
-#+libressl.38a57d0a723d44b51732f8f0a130dc427259f0a14242a9d27cd2a8ca2375256c
-#+s6-networking.a7c2e7379bf16023f84fea5ea8e65d6fb7ce0ce068088f7f769e5bca73afabb5
-#+zsh.327d156100e047d8eeecfc7ccc6adf0e987c046293930c08b4fe0883c6d68983
-#+pthbs-banginstall.bcdce5af9233608b987295f2ed937c31fc00a74fd5aa14253d47cc21ace004ea
-#+aat.91d5450e2b53b6f5b9589e5af677d31da584b22e3d517a49d3ac4d3d1e928e5d
-#+confz.fadcbca8051d36890bbdb3a787efcbd154b62046da3607a9b361cce7907176e4
-#+containers.500f4fb71e330d72f40aa66e1dd3074afbef037af1d02f62872b041484245eb3
-#+fileset.5378d994f1355b0c64fb608929dc43f2e30df1ba91f8db80eca7fc9d9ecd3f9c
-#+logincaps.9f0ee3fb92476fd974f9231b7b60e3e7098af6d1abe7208814f0ec98ee2b679d
-#+snaprep.a82119175f780645fe8c18aefc2738009f711c8d6fa4332c42f28ab6ddeaf44b
-#+curl.44a6fdac6a194de983394771a8b649d5c1ab7e7335fb60c34d06af7ae1200e01
-#+git.dfeaebcfe5b9da10deddf299fa3786125256dbd2f45d065a92341eb4c8cccfd8
-#+xbps.c0d1ba5ccaf97cc331c617e357589ff230832641ea138afd2b5957bbccef9d20
-#+apk-tools.e04ee1e5428558bde1ca9d3c46b29328be14ced4c417385c61863920ad73cb49
-#+getent.308c5e84e6153460a029b2a80b660d653634146ec1f83c30d28e1501be925b3e
-#+getconf.fda245b2b4ba565d975427411db09ef6d746f548a127ae7fbbae4494095c84df
-#+iconv.d44636bff8a1458e751975ae2d5f4bfc2d113505aaf09bd592e09856379885ce
-#+libcap.af7837f04e1b8914be888ac898e2254c463e29db71397a3945044078a12de259
-#+applyuidgid-caps.9b8d6d1e6d645b4766e2b4b4048c3fd084dd3697f221ec4b3d4e4a7ea98b4f0f
-#+ccx-utils.e86caf5af7cfef9e19b6378975368bb3e3cb9975289d9757509dd5a81e27c228
-#+user-env.566cfc95e9d4abba23af86dfc6a764c65ab436a93014cdeea857b809286fd7fa
-#+strace.a8b1584baf720485706de6c04fa384ca6c54a7829d9ad1b019bab2a3794a8c6f
-#+mlog.b386be229184abe7b741bf232a9d346291f79b7ec07053b22a6053c1f17106ca
-#+findutils.35709e9badd93cf847be4b7f7e01b6bfe5a1971db097c44d53973067ea43b375
-#+nawk.78c5902874518e02880ef4bad71e8db0bc9519f111546bb8d27e8127aa279ab6
-#+nvi.733c9c33b03aa2a9ddb8a2dd07032844469c5676d752c8ba71412efb3596f46a
-#+squashfs-tools.e659a2ed7c1182abee5113c1cf054da3b7132d73f8b3e378626622f06d6b69a3
-#+mandoc.e29b7924ba5f4fd40157aedf70b40e6c29c68d5b8906fd1c1d2875d4ec118436
-#+tinyssh.8ad7bb3057999d5e122643cf619eaa101e23191c7b2a6bc460051b543c91b933
-#+system-config.75cd8e7f6cbbfff475ac6be6cda65d8907523c1fb651569b4652196d2e0e2a7d
-#+system-config-rc.4101969617d9fc4e14f0d02edc165b2a242e21e4c1c94394ab04bf9bda9e510a
-#+system-config-scripts.549963a5cd46073cabbad2941d81712aeec813c286fcde5d2503a22937b86fea
-#+system-config-init.b26d6b212bb9129055af27c12c99d7dd7d5d623a3d1d627b2f4527f67ee05ae2
-#+system-config-zsh.0254638ad2b5a0ab663d27c700469cea52629bbd1a7c6926cfbc50971ccde64a
-#+busybox-modutils.0d677f3a8bf4039a7280592d1db2fd10b026f9c7b923afa1b17ad4cd8548c0af-
\ No newline at end of file
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-dosfstools.b0181361412ee80b8fbdeaf2de8c88abefb186161e14c99b3d2648951b294fe9
+#+busybox-e2fsprogs.709b765c4fc220a61c01e5aadb8b41bcd49906a5f0c8ee421d006567dc8121d3
+#+busybox-iproute2.e1c214fc23b2d5d41561b96ae1b0303b53c0804013d66478b12e0d1d34c5e0d9
+#+busybox-iputils.2bab9fbef05e48e219d19d533e8e86cbd68d21dacd1f4bce089cf24cacfe34bf
+#+busybox-net-misc.ae70546784dc33051eec77b83f9cf60fb97f3185af016e372a24ce9f078c77a7
+#+busybox-net-tools.07e53b619ee6dcafac7325ca15c095086f107d15d788c722a1d408ac50f6d0ca
+#+busybox-traceroute.502ef0a4f41187e629a32161c3b8ace008768dcfa98ea8122dd25e5ac61598ab
+#+busybox-wget.4cb39f7f861f581e7d3c6cc9ae93aa77671b626ffabae3d4a73a2d965445e0c7
+#+busybox-chpst.c5f6784b9b7fd6fba34266d08f882752f01a59f68634cdafe5c7760982f95fb7
+#+busybox-console.a0fa6ea977606c6ed873ea9132a87c4f914f6df5c4e298fa5c808c2fd3d3e131
+#+busybox-getty.9c1fff8e7a25032b557d06a0c8375ec44b7d6e0086d3b87dddb67603d79bc021
+#+busybox-i2c-tools.a616cc21a2b196044f0feb186394fcd616401c20b8f5dae9531a05117deb2880
+#+busybox-linux-extra.6e7b9586add776b2876b84a25401b43b99a4de1a16b849a1d9d77c115d2e2ffa
+#+busybox-mtd-utils.53c25959689167a04e532117e89e8d530779b1c41a0bf164cf97f54ce4eac258
+#+busybox-shadow.5222fc3744f686acbe55485b3fea2a496811c930531b3f80a8917b1efbe8c7b7
+#+busybox-su.af59f292f440c415615f599540d498fb30b66d145fb292faddc93cd297d83b3d
+#+busybox-util-linux-priv.fa7c738761e017bbdeade7ef0d4fcf50cc61fffa5e3ab6da5827ce61e8f39ebb
+#+busybox-logging.8e56e9820e6c7dc0a7256bbb153f82b08a1e2a5f9e87165d2fe98e8b1767a648
+#+busybox-cron.d04a4c03f7b1f674d35f71b1d30d0c76b378d3a7b9d4acedd583b8fb2c1e294b
+#+attr.a614cbe43366009d61ef9e4414621bcfe32e40eafad47e51392e57ce30bc5493
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+diffutils.b40fc194bca7de598b5bec3c9680c1e8e1f46b8c30fd22afdf3cd2b776a635e8
+#+patch.2cfd03acd16d0d89685bd0c80dc9fcacb2f3f9802eb0e4011a1af6549f1e08b1
+#+flex.18feadf9d7f890bdc4c3e5417bdf1a8afeb229f1c96901651a515f6f5f2124d4
+#+bison.c5d6f5d738972d9013147f31f59909f6939ed9dacfd666c338d3739b7272e42d
+#+rsync.f0b541ec30aba45436cee1e1c676596c117b838c8de715f4facd4abacf0cdea5
+#+execline.35dcb24605d37b6008fce8c9a796d579eb71c2b8fdd5f98f7facd1e9269b8337
+#+s6.88f5178c72bb586930f096007d40023594e9e22e4ce60486295b861230d6141c
+#+s6-rc.d1d7537d81897440bf66b607f2dd8a6c1f1d0128504a70484fa1b9afb4f4dafa
+#+s6-portable-utils.b9bda7b30d532a39d5663110b7541a7242d71c5908ef45fa0bb8f0727ecf5c7f
+#+s6-linux-utils.d3cf43fae32e55ab9e4096d5a340eabb95ef48ac2ad0d4f2ebf203d182b0099c
+#+s6-linux-init.1d662b3311ca787c0b85e5ec668f9a92522b35800fe488ef1c89ecd27c69234b
+#+mdevd.5aa81fb35128da367473e15e78a8f8291a4f59212c58331a7ac22b92896b5bc1
+#+s6-dns.abab231612702e5214d35c529abbd760877b909f556abc8c81f818dc12444d26
+#+libressl.3268ed19558e6e83802d9a8a91b45387bcdc8ba859a3c76025317984bfd4d6c3
+#+s6-networking.929d13919868b5eb2f3f7dd48cf01175ef54c78830e08972b1a51ae00f6a2621
+#+zsh.f093a067c8d91b8705b929d9c894f92946352174bd7f2d815431abb53a1485de
+#+pthbs-banginstall.71828bbb33047db02a8a5a77c75c03f2936be3714a9e5ce4f827f204fd641533
+#+aat.f20da3ae140a2abf6a989872623636400be84d148b362060d2f3ac1277c6fc7b
+#+confz.40f3ebf52896f6a22b670d1f88618ab80acb7b6f8f001e7c7d66cae2cbb2beb2
+#+containers.948b0d7db1d3eba9d22c692fa2673ffdd9e732aa18357d75264424d4d58f5ae2
+#+fileset.9d268386c0971bf6812475860e281506d8e3df5f13bf0fe698031e2bb5cb9946
+#+logincaps.e38b33b0412066e99af6abab2e88f0861d8dc296905866dbea75a6ccf55d1169
+#+snaprep.03529cf9b1f25ae25cc577df0dc780884824de425003a32b8ad2cef994800a21
+#+curl.10aff6a71692cd6e2f4e930a96bd17c64cf6d795a886b5439fa2bed45ae10229
+#+git.0683d31487071cdeef442a4aa19024ce0881fa64ae875abdd623692e67177da4
+#+xbps.d4a879631e49c4778f7e3d01af68d042569ed18a07db8e1bdc5af0c891e2ebff
+#+apk-tools.209b79078e3a2fe8315e3daa561a853e3ee8649a2b612ea0693b674bec4ec3fb
+#+getent.7ec91acdc0b635eb7b6d4a4426ea49a92c28ea645be9f69e79807531a0e47973
+#+getconf.c00bd5a9aed97955f027a7610828ab557d2be26c14aa46976a00d8687e34821c
+#+iconv.8d4cb8c614a7098c0ba72035571ef410a0e715ed16449cf605266f3ee8f0261c
+#+libcap.978d71a77c9256c0e2187ae8d62922216b7411d4a5f17d2896628c732db4df11
+#+applyuidgid-caps.696bad813e560742aad37d71466e3703bf2eddc9886f052cdb7bbc64b55f65d1
+#+ccx-utils.060f7e168f078cdfdf66be335af7b653e99efe25a8bfc2f060c67dc40f65985a
+#+user-env.6adc0caf53bec1dbe5bd05680e69bac3e723a611e4839c521e6fc6d4603611e4
+#+strace.7fb8b1a8e6e9921b9c07de2c85d4b9b6b2d5d5c2e972902ea62330bce63f9bff
+#+mlog.d1a0d0432092e86b4985cd44454841378ac7e4c3549e83f0a10d70d29a1c0a40
+#+findutils.98530703c3d88a35fdf650055f75ff7e9c18174ab9a91bf6447603cc7b5bffe4
+#+nawk.6fef16603f8152ffa26c1752689b1976932bc9312b681e2d543a309db3d5f522
+#+nvi.2e75bcdd397841a16e132ddc400b496e20d3bb01589c44ce2b8e2048268df046
+#+squashfs-tools.7abec6a90f571f56ee9c7926e5e01fb4c88de1a7ffeea3285afe58e60df3ded4
+#+mandoc.3085f92f95ca1858fe73d1b773c2deb4a25ce2fe8df3831ee27cd5dd085f0ebd
+#+tinyssh.14d90628d7e34b809bff027d37a32a62dd57d996585b694f367bfbdf149462fb
+#+system-config.6734bbf844e880322f461056aff6f24ea3664e9bb763dd65edb5c31d81f24182
+#+system-config-rc.37a61fa6cb61479f61e7c034aa80a291b3f766e3bbdb1d2f4ce181d02d77bc4a
+#+system-config-scripts.8d51fb98f5bdf39018b199868d2b19a0ef136f2ec06e86bde2a38e0f68f79f5f
+#+system-config-init.49902dc3d3272868522c9a02c2c796b098d9e9a4c46059a7d9810840868ae25f
+#+system-config-zsh.0024c99ca2053f35025910da8ab3568668c65c28b123ad68d22c4761546abef3
+#+busybox-modutils.608f36343ec828f6b7d3ba3195bc2514c93595f795e19ceddd46191668e1d88c+
\ No newline at end of file
diff --git a/variants/root-x86_64/diffutils b/variants/root-x86_64/diffutils
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+m4.27f0a202490d82b1635b7cb459d4b9673a51d756911654acf07fe347f47eea0b
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+m4.4ae4e28c98413d9ffde8b4aa5f50af10935690f4a459ad8d7005ebb7299e8767
 #@untar:-J:sha256:90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e:.
 
 
diff --git a/variants/root-x86_64/dune b/variants/root-x86_64/dune
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.6766642c1ca9d7b64ef185bd45a18c55379cb02eb5a74f016fc67c726f049865
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+ocaml.78527b89669f21a6d7c489de475e980a5939a86a3e1f47e7dc6ce48ca6a53739
 #@untar:-z:sha256:579c738f8ca191ba0a9b22dbe78f1377542442c9827cf4939f8964f09f9edb28:.
 
 
diff --git a/variants/root-x86_64/easyseccomp b/variants/root-x86_64/easyseccomp
@@ -1,44 +1,42 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+m4.27f0a202490d82b1635b7cb459d4b9673a51d756911654acf07fe347f47eea0b
-#+patch.257395a41b2f69d0f903104f1c9853be8c9f5fc06526da68ab358bc1be11d61a
-#+flex.d134786b76d557c083764809f126b4b87622d65686b721dd4265e8153af0ad8b
-#+bison.66947d10baf6f9f669c4bdb21dd7d808b01a4f1795910294166b37b3ca99863f
-#+libseccomp.be9719154195b877e74bfb2b030b4c5b21a9e9d0712e569a2b77ac159c0c968b
-#+error-standalone.bf31c2af22fdd603ba4c8e782ee5fe8d1fafd2038d83c87a63c8056e0974c08a
-#+argp-standalone.7a137975b57611bf21d369b56907566fa43653df28ff7f919779a774975cb851
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+m4.4ae4e28c98413d9ffde8b4aa5f50af10935690f4a459ad8d7005ebb7299e8767
+#+patch.2cfd03acd16d0d89685bd0c80dc9fcacb2f3f9802eb0e4011a1af6549f1e08b1
+#+flex.18feadf9d7f890bdc4c3e5417bdf1a8afeb229f1c96901651a515f6f5f2124d4
+#+bison.c5d6f5d738972d9013147f31f59909f6939ed9dacfd666c338d3739b7272e42d
+#+libseccomp.b073c3f0e606d13f628c9ed4e6eb17d9ad56fe2f961d06cb790bed5acd53b976
+#+error-standalone.b087ce1c5a25a25181a930b052f224082e57a56129ff22100153a488cbbeb1f6
+#+argp-standalone.7e6a428339fcfe2ddb17bb5445322b543f6594d54f0fcbf2bb8572b7b5598751
 #@untar::sha256:1b44a63d415c48ac68d210951fec8d4761d3522f3d82d53182e66fabe5e2f2cd:easyseccomp
 #@sha256:eec15ac67403946e9d988d485f11764cf313b4798efe01d40f951ff521a23d10:easyseccomp_fix_includes.patch
 #@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp
diff --git a/variants/root-x86_64/error-standalone b/variants/root-x86_64/error-standalone
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
 #@untar:-z:sha256:0e751989cea94e25d5166a6a1ed9bde218786e39dff82e1f01dff12fc78639d9:.
 
 
diff --git a/variants/root-x86_64/execline b/variants/root-x86_64/execline
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+skalibs.6afe334a070e1566d76daee15d00171a6f6a99f1752e88a80d04378a585dfa77
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+skalibs.069d912bafcaf66a7702f7e9f011cee986805a343f48a310b6358f066a25e2b3
 #@git:6c0957eb5e8eea2ffada4d7be08286f0e81d0527:execline
 
 
@@ -48,7 +46,7 @@ cd 'execline'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.6afe334a070e1566d76daee15d00171a6f6a99f1752e88a80d04378a585dfa77/sysdeps' \
+	--with-sysdeps='/versions/skalibs.069d912bafcaf66a7702f7e9f011cee986805a343f48a310b6358f066a25e2b3/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/root-x86_64/fileset b/variants/root-x86_64/fileset
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+zsh.327d156100e047d8eeecfc7ccc6adf0e987c046293930c08b4fe0883c6d68983
-#+pthbs-banginstall.bcdce5af9233608b987295f2ed937c31fc00a74fd5aa14253d47cc21ace004ea
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+zsh.f093a067c8d91b8705b929d9c894f92946352174bd7f2d815431abb53a1485de
+#+pthbs-banginstall.71828bbb33047db02a8a5a77c75c03f2936be3714a9e5ce4f827f204fd641533
 #@git:1b161b09bc889d17ac0a4ccce2dc3e74b64e1433:fileset
 
 
diff --git a/variants/root-x86_64/findutils b/variants/root-x86_64/findutils
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+m4.27f0a202490d82b1635b7cb459d4b9673a51d756911654acf07fe347f47eea0b
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+m4.4ae4e28c98413d9ffde8b4aa5f50af10935690f4a459ad8d7005ebb7299e8767
 #@untar:-J:sha256:1387e0b67ff247d2abde998f90dfbf70c1491391a59ddfecb8ae698789f0a4f5:.
 
 
diff --git a/variants/root-x86_64/flex b/variants/root-x86_64/flex
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+m4.27f0a202490d82b1635b7cb459d4b9673a51d756911654acf07fe347f47eea0b
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+m4.4ae4e28c98413d9ffde8b4aa5f50af10935690f4a459ad8d7005ebb7299e8767
 #@untar:-z:sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995:.
 
 
diff --git a/variants/root-x86_64/gcc b/variants/root-x86_64/gcc
@@ -59,6 +59,10 @@ find "$pthbs_build_environment/" -type l -print | while IFS= read -r lnk; do
 			;;
 	esac
 done
+mv "$sysroot/$prefix/library.so"/* "$sysroot/$prefix/library"/
+rmdir "$sysroot/$prefix/library.so"
+ln -s 'library' "$sysroot/$prefix/library.so"
+ln -s lib "$sysroot/$prefix/library.so"
 mkdir -p "$sysroot/${musl%/*}"
 ln -s "$musl" "$sysroot/${musl%/*}"
 
diff --git a/variants/root-x86_64/getconf b/variants/root-x86_64/getconf
@@ -1,35 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
 #@sha256:d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae50e320aad247c:getconf.c
 
 
diff --git a/variants/root-x86_64/getent b/variants/root-x86_64/getent
@@ -1,35 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
 #@sha256:002c1a216f6bed0f816ab1cfebde94a0b127193ef410c36b2190599983e015b8:getent.c
 
 
diff --git a/variants/root-x86_64/git b/variants/root-x86_64/git
@@ -1,40 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+m4.27f0a202490d82b1635b7cb459d4b9673a51d756911654acf07fe347f47eea0b
-#+libressl.38a57d0a723d44b51732f8f0a130dc427259f0a14242a9d27cd2a8ca2375256c
-#+curl.44a6fdac6a194de983394771a8b649d5c1ab7e7335fb60c34d06af7ae1200e01
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+m4.4ae4e28c98413d9ffde8b4aa5f50af10935690f4a459ad8d7005ebb7299e8767
+#+libressl.3268ed19558e6e83802d9a8a91b45387bcdc8ba859a3c76025317984bfd4d6c3
+#+curl.10aff6a71692cd6e2f4e930a96bd17c64cf6d795a886b5439fa2bed45ae10229
 #@untar:-J:sha256:f612c1abc63557d50ad3849863fc9109670139fc9901e574460ec76e0511adb9:.
 
 
diff --git a/variants/root-x86_64/gnu-make b/variants/root-x86_64/gnu-make
@@ -1,7 +1,5 @@
 #!/usr/bin/env pthbs-build
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
 #+gnu-make.e4a639067dbdc87f724a0af3861ce3ec1fc8d2ad5046d28f7e687b5ac6e9cc7e
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
diff --git a/variants/root-x86_64/gperf b/variants/root-x86_64/gperf
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+m4.27f0a202490d82b1635b7cb459d4b9673a51d756911654acf07fe347f47eea0b
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+m4.4ae4e28c98413d9ffde8b4aa5f50af10935690f4a459ad8d7005ebb7299e8767
 #@untar:-z:sha256:588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2:.
 
 
diff --git a/variants/root-x86_64/iconv b/variants/root-x86_64/iconv
@@ -1,35 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
 #@sha256:f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7:iconv.c
 
 
diff --git a/variants/root-x86_64/kbd b/variants/root-x86_64/kbd
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+m4.27f0a202490d82b1635b7cb459d4b9673a51d756911654acf07fe347f47eea0b
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+m4.4ae4e28c98413d9ffde8b4aa5f50af10935690f4a459ad8d7005ebb7299e8767
 #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:.
 #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:.
 
diff --git a/variants/root-x86_64/libarchive b/variants/root-x86_64/libarchive
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+m4.27f0a202490d82b1635b7cb459d4b9673a51d756911654acf07fe347f47eea0b
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+m4.4ae4e28c98413d9ffde8b4aa5f50af10935690f4a459ad8d7005ebb7299e8767
 #@untar:-J:sha256:04357661e6717b6941682cde02ad741ae4819c67a260593dfb2431861b251acb:.
 
 
diff --git a/variants/root-x86_64/libbsd b/variants/root-x86_64/libbsd
@@ -1,39 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+m4.27f0a202490d82b1635b7cb459d4b9673a51d756911654acf07fe347f47eea0b
-#+libmd.3922b0ba4058ad1908df983544c8817348c3c8e5a8373f0fc193c6bcf1209e8b
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+m4.4ae4e28c98413d9ffde8b4aa5f50af10935690f4a459ad8d7005ebb7299e8767
+#+libmd.f18eeb534508850e52d1c27498c2dd6aa46de6d786be0f80f2aa9974ec571c41
 #@untar:-J:sha256:55fdfa2696fb4d55a592fa9ad14a9df897c7b0008ddb3b30c419914841f85f33:.
 
 
diff --git a/variants/root-x86_64/libcap b/variants/root-x86_64/libcap
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+pkgconf-pkg-config.0bd26bb5368082438ebcaae7551b1454a03981fc8d8ee799d48d834a26aee1ec
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+pkgconf-pkg-config.8e5c8881361e43bcf5473fa80e75f7aff454d13f9a951d65b42d0d279d6d52bc
 #@untar:-J:sha256:f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb:.
 
 
diff --git a/variants/root-x86_64/libcgroup b/variants/root-x86_64/libcgroup
@@ -1,41 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+m4.27f0a202490d82b1635b7cb459d4b9673a51d756911654acf07fe347f47eea0b
-#+flex.d134786b76d557c083764809f126b4b87622d65686b721dd4265e8153af0ad8b
-#+bison.66947d10baf6f9f669c4bdb21dd7d808b01a4f1795910294166b37b3ca99863f
-#+musl-fts.26ffa7c5ff3f4bd337a26ab969f25c7a3da7a0d474ac8852244986d1d39c5c7a
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+m4.4ae4e28c98413d9ffde8b4aa5f50af10935690f4a459ad8d7005ebb7299e8767
+#+flex.18feadf9d7f890bdc4c3e5417bdf1a8afeb229f1c96901651a515f6f5f2124d4
+#+bison.c5d6f5d738972d9013147f31f59909f6939ed9dacfd666c338d3739b7272e42d
+#+musl-fts.ccd22c2360c5fd9fc2cd5bfff0ebc3b3e2074c7947f14264be97bb31af1e0e41
 #@untar:-z:sha256:8d284d896fca1c981b55850e92acd3ad9648a69227c028dda7ae3402af878edd:.
 
 
diff --git a/variants/root-x86_64/libelf b/variants/root-x86_64/libelf
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+zstd.c6ec354ea78537add9e8d82140cc06feb56411df9e401d2ef1043468768a7780
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+zstd.0fa40e39da3442c34d2afde37dc16288ed90ad6c54cbb77b93a120ef10df712e
 #@git:288355d104ff9930520c0283fe82556c6cc5c16f:libelf
 
 
diff --git a/variants/root-x86_64/libmd b/variants/root-x86_64/libmd
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+m4.27f0a202490d82b1635b7cb459d4b9673a51d756911654acf07fe347f47eea0b
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+m4.4ae4e28c98413d9ffde8b4aa5f50af10935690f4a459ad8d7005ebb7299e8767
 #@untar:-J:sha256:1bd6aa42275313af3141c7cf2e5b964e8b1fd488025caf2f971f43b00776b332:.
 
 
diff --git a/variants/root-x86_64/libressl b/variants/root-x86_64/libressl
@@ -1,39 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+m4.27f0a202490d82b1635b7cb459d4b9673a51d756911654acf07fe347f47eea0b
-#+ca-certificates-wip-donotuse.2574a84b95a8a24cab67fc5d2cfee6a80fc592ceae85298a87ac07cfe8d42f8f
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+m4.4ae4e28c98413d9ffde8b4aa5f50af10935690f4a459ad8d7005ebb7299e8767
+#+ca-certificates-wip-donotuse.b851e079967626f4d591e66d083af3f8665f3d81ac5a1e33ec5a0dd9bf492657
 #@sha256:a68fedc0edd976b9f35ecfdcb252d80dc12084b1bc4e945be7dc42c437d8b540:c_rehash.c
 #@untar:-z:sha256:6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954:.
 
@@ -101,7 +99,7 @@ make DESTDIR="$pthbs_destdir" install
 
 cd ..
 gcc ./c_rehash.c -o c_rehash --static -static -I"$pthbs_destdir/$prefix/include" -L"$pthbs_destdir/$prefix/library" -lssl -lcrypto
-cp -vs '/versions/ca-certificates-wip-donotuse.2574a84b95a8a24cab67fc5d2cfee6a80fc592ceae85298a87ac07cfe8d42f8f/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/"
+cp -vs '/versions/ca-certificates-wip-donotuse.b851e079967626f4d591e66d083af3f8665f3d81ac5a1e33ec5a0dd9bf492657/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/"
 ./c_rehash  "$pthbs_destdir/$prefix/config/ssl/certs/"
 cd  "$pthbs_destdir/$prefix/config/ssl/"
 mv cert.pem libressl-cert.pem
diff --git a/variants/root-x86_64/libseccomp b/variants/root-x86_64/libseccomp
@@ -1,40 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+m4.27f0a202490d82b1635b7cb459d4b9673a51d756911654acf07fe347f47eea0b
-#+pkgconf-pkg-config.0bd26bb5368082438ebcaae7551b1454a03981fc8d8ee799d48d834a26aee1ec
-#+gperf.fe3c859f4a9eed714821f30244cea0e8d910fc8e15b3aed5decb358bbccaf90b
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+m4.4ae4e28c98413d9ffde8b4aa5f50af10935690f4a459ad8d7005ebb7299e8767
+#+pkgconf-pkg-config.8e5c8881361e43bcf5473fa80e75f7aff454d13f9a951d65b42d0d279d6d52bc
+#+gperf.96c0cceae7c82ce4ee9000a6cddc355de4d5ca040c260ac34469c94b5f5f1610
 #@untar:-z:sha256:83b6085232d1588c379dc9b9cae47bb37407cf262e6e74993c61ba72d2a784dc:.
 
 
diff --git a/variants/root-x86_64/libunwind b/variants/root-x86_64/libunwind
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+m4.27f0a202490d82b1635b7cb459d4b9673a51d756911654acf07fe347f47eea0b
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+m4.4ae4e28c98413d9ffde8b4aa5f50af10935690f4a459ad8d7005ebb7299e8767
 #@untar:-z:sha256:ddf0e32dd5fafe5283198d37e4bf9decf7ba1770b6e7e006c33e6df79e6a6157:.
 
 
diff --git a/variants/root-x86_64/linux-qemu-guest b/variants/root-x86_64/linux-qemu-guest
@@ -1,46 +1,44 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nofail_digest
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-modutils.0d677f3a8bf4039a7280592d1db2fd10b026f9c7b923afa1b17ad4cd8548c0af
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+findutils.35709e9badd93cf847be4b7f7e01b6bfe5a1971db097c44d53973067ea43b375
-#+diffutils.a121b3cebda43b7cf8f0a8772b8e7af487aa8749a9d8359f267adda0e6c1744c
-#+patch.257395a41b2f69d0f903104f1c9853be8c9f5fc06526da68ab358bc1be11d61a
-#+flex.d134786b76d557c083764809f126b4b87622d65686b721dd4265e8153af0ad8b
-#+bison.66947d10baf6f9f669c4bdb21dd7d808b01a4f1795910294166b37b3ca99863f
-#+rsync.abb640b022ca32a19a7323211846022ec3e9b6d90379565df2f72c9f1f7e3851
-#+zstd.c6ec354ea78537add9e8d82140cc06feb56411df9e401d2ef1043468768a7780
-#+libelf.8a19a3aa910725143d535258f5d198c989b7240b26af021891c8fb75efb7fe8e
-#+pkgconf-pkg-config.0bd26bb5368082438ebcaae7551b1454a03981fc8d8ee799d48d834a26aee1ec
-#+nawk.78c5902874518e02880ef4bad71e8db0bc9519f111546bb8d27e8127aa279ab6
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-modutils.608f36343ec828f6b7d3ba3195bc2514c93595f795e19ceddd46191668e1d88c
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+findutils.98530703c3d88a35fdf650055f75ff7e9c18174ab9a91bf6447603cc7b5bffe4
+#+diffutils.b40fc194bca7de598b5bec3c9680c1e8e1f46b8c30fd22afdf3cd2b776a635e8
+#+patch.2cfd03acd16d0d89685bd0c80dc9fcacb2f3f9802eb0e4011a1af6549f1e08b1
+#+flex.18feadf9d7f890bdc4c3e5417bdf1a8afeb229f1c96901651a515f6f5f2124d4
+#+bison.c5d6f5d738972d9013147f31f59909f6939ed9dacfd666c338d3739b7272e42d
+#+rsync.f0b541ec30aba45436cee1e1c676596c117b838c8de715f4facd4abacf0cdea5
+#+zstd.0fa40e39da3442c34d2afde37dc16288ed90ad6c54cbb77b93a120ef10df712e
+#+libelf.f4f12de41dc6fb0de44777dbdd103d20eb562f71f3c483bbc64bd4491952bda8
+#+pkgconf-pkg-config.8e5c8881361e43bcf5473fa80e75f7aff454d13f9a951d65b42d0d279d6d52bc
+#+nawk.6fef16603f8152ffa26c1752689b1976932bc9312b681e2d543a309db3d5f522
 #@untar:-J:sha256:7586962547803be7ecc4056efc927fb25214548722bd28171172f3599abb9764:.
 #@sha256:cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867:linux.config
 #@sha256:ff3ddd131d73fee6838b11a6c4773bdb85c5f60fdd4b9ac4120ced021c341417:noobjtool.patch
diff --git a/variants/root-x86_64/logincaps b/variants/root-x86_64/logincaps
@@ -1,39 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+zsh.327d156100e047d8eeecfc7ccc6adf0e987c046293930c08b4fe0883c6d68983
-#+pthbs-banginstall.bcdce5af9233608b987295f2ed937c31fc00a74fd5aa14253d47cc21ace004ea
-#+execline.2dab6919e5c6a8d2bbcf40f011bf2c0865fffc8c9f2f761a492304a4597193a7
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ccx-utils.e86caf5af7cfef9e19b6378975368bb3e3cb9975289d9757509dd5a81e27c228
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+zsh.f093a067c8d91b8705b929d9c894f92946352174bd7f2d815431abb53a1485de
+#+pthbs-banginstall.71828bbb33047db02a8a5a77c75c03f2936be3714a9e5ce4f827f204fd641533
+#+execline.35dcb24605d37b6008fce8c9a796d579eb71c2b8fdd5f98f7facd1e9269b8337
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+ccx-utils.060f7e168f078cdfdf66be335af7b653e99efe25a8bfc2f060c67dc40f65985a
 #@git:409db79b3e7e5fc6b73305471d9bbb6ac5c14036:logincaps
 
 
diff --git a/variants/root-x86_64/m4 b/variants/root-x86_64/m4
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
 #@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:.
 
 
diff --git a/variants/root-x86_64/mandoc b/variants/root-x86_64/mandoc
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
 #@untar:-z:sha256:8bf0d570f01e70a6e124884088870cbed7537f36328d512909eb10cd53179d9c:.
 
 
diff --git a/variants/root-x86_64/mdev-scripts b/variants/root-x86_64/mdev-scripts
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+zsh.327d156100e047d8eeecfc7ccc6adf0e987c046293930c08b4fe0883c6d68983
-#+pthbs-banginstall.bcdce5af9233608b987295f2ed937c31fc00a74fd5aa14253d47cc21ace004ea
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+zsh.f093a067c8d91b8705b929d9c894f92946352174bd7f2d815431abb53a1485de
+#+pthbs-banginstall.71828bbb33047db02a8a5a77c75c03f2936be3714a9e5ce4f827f204fd641533
 #@git:395634340de8349996fd273b055ae4bac9d2897c:mdev-scripts
 
 
diff --git a/variants/root-x86_64/mdevd b/variants/root-x86_64/mdevd
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+skalibs.6afe334a070e1566d76daee15d00171a6f6a99f1752e88a80d04378a585dfa77
-#+execline.2dab6919e5c6a8d2bbcf40f011bf2c0865fffc8c9f2f761a492304a4597193a7
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+skalibs.069d912bafcaf66a7702f7e9f011cee986805a343f48a310b6358f066a25e2b3
+#+execline.35dcb24605d37b6008fce8c9a796d579eb71c2b8fdd5f98f7facd1e9269b8337
 #@git:96aef400b9f9d14f3bf54b0e444e9ad3665c4107:mdevd
 
 
@@ -49,7 +47,7 @@ cd 'mdevd'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.6afe334a070e1566d76daee15d00171a6f6a99f1752e88a80d04378a585dfa77/sysdeps' \
+	--with-sysdeps='/versions/skalibs.069d912bafcaf66a7702f7e9f011cee986805a343f48a310b6358f066a25e2b3/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/root-x86_64/mdevd.environment b/variants/root-x86_64/mdevd.environment
@@ -1,51 +1,51 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-dosfstools.51ae6c1b897b61a65e52fe1867ebaeb2b7129e3b2b00e1118651d9bd011fc0e7
-#+busybox-e2fsprogs.57511c62d2721493f67d82e7465c20bc041f9b7642350f408d8a9498b4ae6b1f
-#+busybox-iproute2.ae76a929509894a9042994f88a9bfbd499d2589a48a68017f29e2af24cbf1b58
-#+busybox-iputils.2f1e875a68289723897606a0fcb921d38bc67b14707a78e18b1de8d91005cda4
-#+busybox-net-misc.de2f5c6384b8e8c70a1c2ad6d027ad0c50109ea95c649297f55257f2736aff84
-#+busybox-net-tools.f7c055b657de06ef2bf81f6402afe78a9e89addf12956f66fa7ebfbe26ef3222
-#+busybox-traceroute.e46d0e67d086c1a195ed0763bb52e9a74f06d28aeaf1a1c746bb17bfa0e2ca9b
-#+busybox-wget.a9e82d6bfedd9d0efec6d8bad11a5ccc50c01f96df7b23f0a9348aacd07dd78f
-#+busybox-chpst.4e4af9a70d109f6c2959c89b2e3cd577a382dec26e165631eaf00ee8f309113a
-#+busybox-console.fe9161b5896d9c52ead9d9ac22702036ed0573f9825c6221d3b39fca0834a2b1
-#+busybox-getty.c9e6d1b5f90374377bbc86c725af4589ab8da489a44a9ed485bcee2588222dc6
-#+busybox-i2c-tools.1ced7e745272b49a031cd14d8bb7b159018576f73e68601d6577215d3afbb9e7
-#+busybox-linux-extra.a4daaefe0a8f448bc4acf27e5de328de4611093ec3462fcf073d84c8761800e7
-#+busybox-mtd-utils.def4ab7f42c38ee13602f92e1d1c71c363f10f5aafb11dbb7e2b77541fc6202d
-#+busybox-shadow.51dae647f5d67da7ddef7413dc3b664f0c958cb99b9a0a4fe651b81be13d48b6
-#+busybox-su.124cfc7487bd56030e786be3207217deec1aea7026d2d9ba2866d97919ceae53
-#+busybox-util-linux-priv.2fa8487f5bb7412433c285282acd00857a6406b5f1aeb8eb94f733201f38b3e6
-#+busybox-logging.4b8f2db51b1c133dcb116b129f70c42b0235be90a5b93319db5653cf44cb00d5
-#+busybox-cron.7242ab370d42aefd0899d346a4fe14c4d42b1e4666ceb448a70b5f759a2e8c5c
-#+execline.2dab6919e5c6a8d2bbcf40f011bf2c0865fffc8c9f2f761a492304a4597193a7
-#+s6.bc027c0b76a325e17e0f7392c2756257d7c8b758c960430f116c4bd87038d5a2
-#+mdev-scripts.95f0056921b7629d4ccf968eab9c55751dcc9ca049d866f0068f8c9d9fd3310b
-#+mdevd.bff4a945d357beb45c35b039c90fe64ce9b8f79edf9f3598af9f093be68ea991
-#+busybox-modutils.0d677f3a8bf4039a7280592d1db2fd10b026f9c7b923afa1b17ad4cd8548c0af-
\ No newline at end of file
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-dosfstools.b0181361412ee80b8fbdeaf2de8c88abefb186161e14c99b3d2648951b294fe9
+#+busybox-e2fsprogs.709b765c4fc220a61c01e5aadb8b41bcd49906a5f0c8ee421d006567dc8121d3
+#+busybox-iproute2.e1c214fc23b2d5d41561b96ae1b0303b53c0804013d66478b12e0d1d34c5e0d9
+#+busybox-iputils.2bab9fbef05e48e219d19d533e8e86cbd68d21dacd1f4bce089cf24cacfe34bf
+#+busybox-net-misc.ae70546784dc33051eec77b83f9cf60fb97f3185af016e372a24ce9f078c77a7
+#+busybox-net-tools.07e53b619ee6dcafac7325ca15c095086f107d15d788c722a1d408ac50f6d0ca
+#+busybox-traceroute.502ef0a4f41187e629a32161c3b8ace008768dcfa98ea8122dd25e5ac61598ab
+#+busybox-wget.4cb39f7f861f581e7d3c6cc9ae93aa77671b626ffabae3d4a73a2d965445e0c7
+#+busybox-chpst.c5f6784b9b7fd6fba34266d08f882752f01a59f68634cdafe5c7760982f95fb7
+#+busybox-console.a0fa6ea977606c6ed873ea9132a87c4f914f6df5c4e298fa5c808c2fd3d3e131
+#+busybox-getty.9c1fff8e7a25032b557d06a0c8375ec44b7d6e0086d3b87dddb67603d79bc021
+#+busybox-i2c-tools.a616cc21a2b196044f0feb186394fcd616401c20b8f5dae9531a05117deb2880
+#+busybox-linux-extra.6e7b9586add776b2876b84a25401b43b99a4de1a16b849a1d9d77c115d2e2ffa
+#+busybox-mtd-utils.53c25959689167a04e532117e89e8d530779b1c41a0bf164cf97f54ce4eac258
+#+busybox-shadow.5222fc3744f686acbe55485b3fea2a496811c930531b3f80a8917b1efbe8c7b7
+#+busybox-su.af59f292f440c415615f599540d498fb30b66d145fb292faddc93cd297d83b3d
+#+busybox-util-linux-priv.fa7c738761e017bbdeade7ef0d4fcf50cc61fffa5e3ab6da5827ce61e8f39ebb
+#+busybox-logging.8e56e9820e6c7dc0a7256bbb153f82b08a1e2a5f9e87165d2fe98e8b1767a648
+#+busybox-cron.d04a4c03f7b1f674d35f71b1d30d0c76b378d3a7b9d4acedd583b8fb2c1e294b
+#+execline.35dcb24605d37b6008fce8c9a796d579eb71c2b8fdd5f98f7facd1e9269b8337
+#+s6.88f5178c72bb586930f096007d40023594e9e22e4ce60486295b861230d6141c
+#+mdev-scripts.61b202ce65d70462f9af2a4c4367a6650b0b7371c1ca8d8529549cb10f87deb2
+#+mdevd.5aa81fb35128da367473e15e78a8f8291a4f59212c58331a7ac22b92896b5bc1
+#+busybox-modutils.608f36343ec828f6b7d3ba3195bc2514c93595f795e19ceddd46191668e1d88c+
\ No newline at end of file
diff --git a/variants/root-x86_64/mlog b/variants/root-x86_64/mlog
@@ -1,36 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
 #@git:fefc95731f1260810a3551226b73d35f3d6e9d9e:mlog
 
 
diff --git a/variants/root-x86_64/musl-fts b/variants/root-x86_64/musl-fts
@@ -1,36 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
 #@untar:-z:sha256:49ae567a96dbab22823d045ffebe0d6b14b9b799925e9ca9274d47d26ff482a6:.
 
 
diff --git a/variants/root-x86_64/nawk b/variants/root-x86_64/nawk
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+bison.66947d10baf6f9f669c4bdb21dd7d808b01a4f1795910294166b37b3ca99863f
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+bison.c5d6f5d738972d9013147f31f59909f6939ed9dacfd666c338d3739b7272e42d
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
 #@untar:-z:sha256:e031b1e1d2b230f276f975bffb923f0ea15f798c839d15a3f26a1a39448e32d7:.
 
 
diff --git a/variants/root-x86_64/netbsd-curses b/variants/root-x86_64/netbsd-curses
@@ -1,36 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
 #@git:51d179dad861640caeb76674b5908ccd79f04fae:netbsd-curses
 
 
diff --git a/variants/root-x86_64/nvi b/variants/root-x86_64/nvi
@@ -1,39 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+m4.27f0a202490d82b1635b7cb459d4b9673a51d756911654acf07fe347f47eea0b
-#+netbsd-curses.9e35f0bdfc9f1003a23f6fc0fc7fad40f5dc48fec27e9c12d0ba521555764d5c
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+m4.4ae4e28c98413d9ffde8b4aa5f50af10935690f4a459ad8d7005ebb7299e8767
+#+netbsd-curses.c469b70a4e0e4bdc287dbb56603a6a8f2c002f390d6df4e94b85d0002c27d0af
 #@untar:-z:sha256:755b87aa1e25c24c4c1668de5573d7d9a327b529423ce3ad9ee753bfb2296e33:.
 
 
diff --git a/variants/root-x86_64/ocaml-astring b/variants/root-x86_64/ocaml-astring
@@ -1,41 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.6766642c1ca9d7b64ef185bd45a18c55379cb02eb5a74f016fc67c726f049865
-#+ocaml-findlib.fc5a9b799a288326c7aa0e887e896ddad578c8ced7cbe8005f75cd534cf1d1a2
-#+ocamlbuild.4744a973661de01f3d5000a0949b2728959b4a5e8f61d5d90dab5e79853bd1b1
-#+opam.b6fa21f6056616833a0b71204d85c8fd7a3fd0c4015ba02945ea2f7013dbe91b
-#+ocaml-topkg.3006e629706042d687935b8bd450b0d9107bbe9bb9cf35b7c0982bc4d4454c50
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+ocaml.78527b89669f21a6d7c489de475e980a5939a86a3e1f47e7dc6ce48ca6a53739
+#+ocaml-findlib.0e64370f80f1a836827d8cb9e521113396b7e5636b26af955dea79cbe0832a7c
+#+ocamlbuild.218b28a5fd79197fe9c94ace583ae9cdac258aee4e71024115a4a34467ca0566
+#+opam.45111d16ecab2ebc78b157affa52e1c4a9a3325fccb1891aaf2081406fe1c0e9
+#+ocaml-topkg.58fecb25f20f2c26d43b2d425e84e5c5bec5c75f09c47eb6a65c5d9f30396a4b
 #@untar:-j:sha256:865692630c07c3ab87c66cdfc2734c0fdfc9c34a57f8e89ffec7c7d15e7a70fa:.
 
 
diff --git a/variants/root-x86_64/ocaml-base b/variants/root-x86_64/ocaml-base
@@ -1,40 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.6766642c1ca9d7b64ef185bd45a18c55379cb02eb5a74f016fc67c726f049865
-#+dune.8c4e2bf379ae3da0b215aac7a77daffcb74e12361a359c2b3f095a83be957fc4
-#+ocaml_intrinsics_kernel.79c760f1ee15944c9683adeaef2e35d2daf2c214192074b699c0ca01c09c7eb0
-#+ocaml-sexplib0.162d1ad761b435b2d0da96b1cb43648ba6738f2be1bc2166a267df8577e11db6
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+ocaml.78527b89669f21a6d7c489de475e980a5939a86a3e1f47e7dc6ce48ca6a53739
+#+dune.24dd22350eb03f161d73dbc88c6f1180095c6d73cd438b11350dd64767c4e93a
+#+ocaml_intrinsics_kernel.d53392f7a4267bfa03de2bb907734c28045356ccc40ca51228c05a28d0cc6173
+#+ocaml-sexplib0.523256ead397b1e5ce631166cbc73c6bbadcce527d00814d1eea4e36eaf2aa6f
 #@untar:-z:sha256:3f3f64789ab25bb5cb7f5f907dd651dec9cc9440981822fe75df6b94344b7208:.
 
 
diff --git a/variants/root-x86_64/ocaml-bos b/variants/root-x86_64/ocaml-bos
@@ -1,47 +1,45 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.6766642c1ca9d7b64ef185bd45a18c55379cb02eb5a74f016fc67c726f049865
-#+ocaml-findlib.fc5a9b799a288326c7aa0e887e896ddad578c8ced7cbe8005f75cd534cf1d1a2
-#+ocamlbuild.4744a973661de01f3d5000a0949b2728959b4a5e8f61d5d90dab5e79853bd1b1
-#+opam.b6fa21f6056616833a0b71204d85c8fd7a3fd0c4015ba02945ea2f7013dbe91b
-#+ocaml-topkg.3006e629706042d687935b8bd450b0d9107bbe9bb9cf35b7c0982bc4d4454c50
-#+ocaml-astring.cdea0d0e608a9ab7fe7a5a7000c08bf283b4686cbed39cd6e4b8939cb82d20be
-#+ocaml-fpath.8f93c1f351834671f8a6b80f36c79c1c6272e443bb14f7270ea7c50e72d61cc0
-#+ocaml-rresult.05ea2f57aee6f7c03300b7f66d20e10bbdc5a2ae6e575a811da8b61357c48a65
-#+ocaml-fmt.f0b583159bed47e955afcfbc9f8385808b4ea4be6c91696bf0b548758bbbd8f3
-#+ocaml-logs.7c72ba1fc0515b5c9b95d787d3ae5788fec08ecf5844b213888dd69277cb0274
-#+ocaml-mtime.4ab15f9450c583b6ea8be96d51b78264e083e26a12fe556d4126b39fdb8b7050
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+ocaml.78527b89669f21a6d7c489de475e980a5939a86a3e1f47e7dc6ce48ca6a53739
+#+ocaml-findlib.0e64370f80f1a836827d8cb9e521113396b7e5636b26af955dea79cbe0832a7c
+#+ocamlbuild.218b28a5fd79197fe9c94ace583ae9cdac258aee4e71024115a4a34467ca0566
+#+opam.45111d16ecab2ebc78b157affa52e1c4a9a3325fccb1891aaf2081406fe1c0e9
+#+ocaml-topkg.58fecb25f20f2c26d43b2d425e84e5c5bec5c75f09c47eb6a65c5d9f30396a4b
+#+ocaml-astring.fd73dc472cf345d61985d230a76410648febc6eff1b0c4389ea877d5464dafeb
+#+ocaml-fpath.02147f3ae7f1e434deae05dd6c74b64800c1718b106ee875d84d1300f3180b4f
+#+ocaml-rresult.192347cde056c34ea123989ce702475ce7ccfeef0ba8469b57f506d32b88e44c
+#+ocaml-fmt.a7808490ac012bca37aa2f1c78318d490cb1d5f38356b15a783ebff3ea773b37
+#+ocaml-logs.a4fba7dd862a4c9a742c0737fd50492197ba1b849882a78beb1e29c7b128cc1a
+#+ocaml-mtime.da278fc30a7976dc22714872c2741d383722c333ba2880bd6f7cadeac79c5c5f
 #@untar:-j:sha256:d8d62e786b10d697e0457205a8eedeaa27ebcc90f1855f18df190cac2e3d8f37:.
 
 
diff --git a/variants/root-x86_64/ocaml-cmdliner b/variants/root-x86_64/ocaml-cmdliner
@@ -1,41 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.6766642c1ca9d7b64ef185bd45a18c55379cb02eb5a74f016fc67c726f049865
-#+ocaml-findlib.fc5a9b799a288326c7aa0e887e896ddad578c8ced7cbe8005f75cd534cf1d1a2
-#+ocamlbuild.4744a973661de01f3d5000a0949b2728959b4a5e8f61d5d90dab5e79853bd1b1
-#+opam.b6fa21f6056616833a0b71204d85c8fd7a3fd0c4015ba02945ea2f7013dbe91b
-#+ocaml-topkg.3006e629706042d687935b8bd450b0d9107bbe9bb9cf35b7c0982bc4d4454c50
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+ocaml.78527b89669f21a6d7c489de475e980a5939a86a3e1f47e7dc6ce48ca6a53739
+#+ocaml-findlib.0e64370f80f1a836827d8cb9e521113396b7e5636b26af955dea79cbe0832a7c
+#+ocamlbuild.218b28a5fd79197fe9c94ace583ae9cdac258aee4e71024115a4a34467ca0566
+#+opam.45111d16ecab2ebc78b157affa52e1c4a9a3325fccb1891aaf2081406fe1c0e9
+#+ocaml-topkg.58fecb25f20f2c26d43b2d425e84e5c5bec5c75f09c47eb6a65c5d9f30396a4b
 #@untar:-j:sha256:4e547a631c36fbaadff60d3bd7724eb3f83ba274e92fb725950bae7868378582:.
 
 
diff --git a/variants/root-x86_64/ocaml-compiler-libs b/variants/root-x86_64/ocaml-compiler-libs
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.6766642c1ca9d7b64ef185bd45a18c55379cb02eb5a74f016fc67c726f049865
-#+dune.8c4e2bf379ae3da0b215aac7a77daffcb74e12361a359c2b3f095a83be957fc4
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+ocaml.78527b89669f21a6d7c489de475e980a5939a86a3e1f47e7dc6ce48ca6a53739
+#+dune.24dd22350eb03f161d73dbc88c6f1180095c6d73cd438b11350dd64767c4e93a
 #@untar:-z:sha256:9b9644d7351db699e57ddba7c767bb4153e6e988ccf45ead2fb238a3bd75cdc7:.
 
 
diff --git a/variants/root-x86_64/ocaml-cppo b/variants/root-x86_64/ocaml-cppo
@@ -1,39 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.6766642c1ca9d7b64ef185bd45a18c55379cb02eb5a74f016fc67c726f049865
-#+dune.8c4e2bf379ae3da0b215aac7a77daffcb74e12361a359c2b3f095a83be957fc4
-#+ocamlbuild.4744a973661de01f3d5000a0949b2728959b4a5e8f61d5d90dab5e79853bd1b1
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+ocaml.78527b89669f21a6d7c489de475e980a5939a86a3e1f47e7dc6ce48ca6a53739
+#+dune.24dd22350eb03f161d73dbc88c6f1180095c6d73cd438b11350dd64767c4e93a
+#+ocamlbuild.218b28a5fd79197fe9c94ace583ae9cdac258aee4e71024115a4a34467ca0566
 #@untar:-z:sha256:6e62a8ee0217c9cc38d5860110eb18eb8d89c05c420353d298e1431fe8bac00f:.
 
 
diff --git a/variants/root-x86_64/ocaml-findlib b/variants/root-x86_64/ocaml-findlib
@@ -1,41 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+m4.27f0a202490d82b1635b7cb459d4b9673a51d756911654acf07fe347f47eea0b
-#+netbsd-curses.9e35f0bdfc9f1003a23f6fc0fc7fad40f5dc48fec27e9c12d0ba521555764d5c
-#+ocaml.6766642c1ca9d7b64ef185bd45a18c55379cb02eb5a74f016fc67c726f049865
-#+ocamlbuild.4744a973661de01f3d5000a0949b2728959b4a5e8f61d5d90dab5e79853bd1b1
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+m4.4ae4e28c98413d9ffde8b4aa5f50af10935690f4a459ad8d7005ebb7299e8767
+#+netbsd-curses.c469b70a4e0e4bdc287dbb56603a6a8f2c002f390d6df4e94b85d0002c27d0af
+#+ocaml.78527b89669f21a6d7c489de475e980a5939a86a3e1f47e7dc6ce48ca6a53739
+#+ocamlbuild.218b28a5fd79197fe9c94ace583ae9cdac258aee4e71024115a4a34467ca0566
 #@untar:-z:sha256:662c910f774e9fee3a19c4e057f380581ab2fc4ee52da4761304ac9c31b8869d:.
 
 
@@ -81,7 +79,7 @@ cd 'findlib-1.9.8'
 make -j1 all opt
 
 # workaround `topfind` getting installed to stdlib directory, this is not configurable
-stdlib="$pthbs_destdir/versions/ocaml.6766642c1ca9d7b64ef185bd45a18c55379cb02eb5a74f016fc67c726f049865"
+stdlib="$pthbs_destdir/versions/ocaml.78527b89669f21a6d7c489de475e980a5939a86a3e1f47e7dc6ce48ca6a53739"
 mkdir -p "${stdlib%/*}"
 ln -s "$pthbs_package" "$stdlib"
 make install prefix="$pthbs_destdir"
diff --git a/variants/root-x86_64/ocaml-fmt b/variants/root-x86_64/ocaml-fmt
@@ -1,42 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.6766642c1ca9d7b64ef185bd45a18c55379cb02eb5a74f016fc67c726f049865
-#+ocaml-findlib.fc5a9b799a288326c7aa0e887e896ddad578c8ced7cbe8005f75cd534cf1d1a2
-#+ocamlbuild.4744a973661de01f3d5000a0949b2728959b4a5e8f61d5d90dab5e79853bd1b1
-#+opam.b6fa21f6056616833a0b71204d85c8fd7a3fd0c4015ba02945ea2f7013dbe91b
-#+ocaml-topkg.3006e629706042d687935b8bd450b0d9107bbe9bb9cf35b7c0982bc4d4454c50
-#+ocaml-cmdliner.56089d7bbe7b4db0902662c47f9edadf6c06183a2fb8fe99942038f0dd634594
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+ocaml.78527b89669f21a6d7c489de475e980a5939a86a3e1f47e7dc6ce48ca6a53739
+#+ocaml-findlib.0e64370f80f1a836827d8cb9e521113396b7e5636b26af955dea79cbe0832a7c
+#+ocamlbuild.218b28a5fd79197fe9c94ace583ae9cdac258aee4e71024115a4a34467ca0566
+#+opam.45111d16ecab2ebc78b157affa52e1c4a9a3325fccb1891aaf2081406fe1c0e9
+#+ocaml-topkg.58fecb25f20f2c26d43b2d425e84e5c5bec5c75f09c47eb6a65c5d9f30396a4b
+#+ocaml-cmdliner.8d34b55de65367015f9cdb1981733e5c057ce83593107b9c4ca416dfe71cbe06
 #@untar:-j:sha256:857cfd47a54b52429cd9b3e2665e44173cd1bd3b435bece7172f984ad5376a1b:.
 
 
diff --git a/variants/root-x86_64/ocaml-fpath b/variants/root-x86_64/ocaml-fpath
@@ -1,42 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.6766642c1ca9d7b64ef185bd45a18c55379cb02eb5a74f016fc67c726f049865
-#+ocaml-findlib.fc5a9b799a288326c7aa0e887e896ddad578c8ced7cbe8005f75cd534cf1d1a2
-#+ocamlbuild.4744a973661de01f3d5000a0949b2728959b4a5e8f61d5d90dab5e79853bd1b1
-#+opam.b6fa21f6056616833a0b71204d85c8fd7a3fd0c4015ba02945ea2f7013dbe91b
-#+ocaml-topkg.3006e629706042d687935b8bd450b0d9107bbe9bb9cf35b7c0982bc4d4454c50
-#+ocaml-astring.cdea0d0e608a9ab7fe7a5a7000c08bf283b4686cbed39cd6e4b8939cb82d20be
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+ocaml.78527b89669f21a6d7c489de475e980a5939a86a3e1f47e7dc6ce48ca6a53739
+#+ocaml-findlib.0e64370f80f1a836827d8cb9e521113396b7e5636b26af955dea79cbe0832a7c
+#+ocamlbuild.218b28a5fd79197fe9c94ace583ae9cdac258aee4e71024115a4a34467ca0566
+#+opam.45111d16ecab2ebc78b157affa52e1c4a9a3325fccb1891aaf2081406fe1c0e9
+#+ocaml-topkg.58fecb25f20f2c26d43b2d425e84e5c5bec5c75f09c47eb6a65c5d9f30396a4b
+#+ocaml-astring.fd73dc472cf345d61985d230a76410648febc6eff1b0c4389ea877d5464dafeb
 #@untar:-j:sha256:12b08ff192d037d9b6d69e9ca19d1d385184f20b3237c27231e437ac81ace70f:.
 
 
diff --git a/variants/root-x86_64/ocaml-logs b/variants/root-x86_64/ocaml-logs
@@ -1,44 +1,42 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.6766642c1ca9d7b64ef185bd45a18c55379cb02eb5a74f016fc67c726f049865
-#+ocaml-findlib.fc5a9b799a288326c7aa0e887e896ddad578c8ced7cbe8005f75cd534cf1d1a2
-#+ocamlbuild.4744a973661de01f3d5000a0949b2728959b4a5e8f61d5d90dab5e79853bd1b1
-#+opam.b6fa21f6056616833a0b71204d85c8fd7a3fd0c4015ba02945ea2f7013dbe91b
-#+ocaml-topkg.3006e629706042d687935b8bd450b0d9107bbe9bb9cf35b7c0982bc4d4454c50
-#+ocaml-mtime.4ab15f9450c583b6ea8be96d51b78264e083e26a12fe556d4126b39fdb8b7050
-#+ocaml-cmdliner.56089d7bbe7b4db0902662c47f9edadf6c06183a2fb8fe99942038f0dd634594
-#+ocaml-fmt.f0b583159bed47e955afcfbc9f8385808b4ea4be6c91696bf0b548758bbbd8f3
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+ocaml.78527b89669f21a6d7c489de475e980a5939a86a3e1f47e7dc6ce48ca6a53739
+#+ocaml-findlib.0e64370f80f1a836827d8cb9e521113396b7e5636b26af955dea79cbe0832a7c
+#+ocamlbuild.218b28a5fd79197fe9c94ace583ae9cdac258aee4e71024115a4a34467ca0566
+#+opam.45111d16ecab2ebc78b157affa52e1c4a9a3325fccb1891aaf2081406fe1c0e9
+#+ocaml-topkg.58fecb25f20f2c26d43b2d425e84e5c5bec5c75f09c47eb6a65c5d9f30396a4b
+#+ocaml-mtime.da278fc30a7976dc22714872c2741d383722c333ba2880bd6f7cadeac79c5c5f
+#+ocaml-cmdliner.8d34b55de65367015f9cdb1981733e5c057ce83593107b9c4ca416dfe71cbe06
+#+ocaml-fmt.a7808490ac012bca37aa2f1c78318d490cb1d5f38356b15a783ebff3ea773b37
 #@untar:-j:sha256:ee97065ba41ce28f19dea9453c6bec4e0ef26165ad7394c4131ea0c65c0f06d5:.
 
 
diff --git a/variants/root-x86_64/ocaml-lun b/variants/root-x86_64/ocaml-lun
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.6766642c1ca9d7b64ef185bd45a18c55379cb02eb5a74f016fc67c726f049865
-#+dune.8c4e2bf379ae3da0b215aac7a77daffcb74e12361a359c2b3f095a83be957fc4
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+ocaml.78527b89669f21a6d7c489de475e980a5939a86a3e1f47e7dc6ce48ca6a53739
+#+dune.24dd22350eb03f161d73dbc88c6f1180095c6d73cd438b11350dd64767c4e93a
 #@untar:-j:sha256:cca8badff83b470fdcfb1840116f8e8a6f2cb86cde2f44ed28cf26cbf692a793:.
 
 
diff --git a/variants/root-x86_64/ocaml-mtime b/variants/root-x86_64/ocaml-mtime
@@ -1,41 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.6766642c1ca9d7b64ef185bd45a18c55379cb02eb5a74f016fc67c726f049865
-#+ocaml-findlib.fc5a9b799a288326c7aa0e887e896ddad578c8ced7cbe8005f75cd534cf1d1a2
-#+ocamlbuild.4744a973661de01f3d5000a0949b2728959b4a5e8f61d5d90dab5e79853bd1b1
-#+opam.b6fa21f6056616833a0b71204d85c8fd7a3fd0c4015ba02945ea2f7013dbe91b
-#+ocaml-topkg.3006e629706042d687935b8bd450b0d9107bbe9bb9cf35b7c0982bc4d4454c50
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+ocaml.78527b89669f21a6d7c489de475e980a5939a86a3e1f47e7dc6ce48ca6a53739
+#+ocaml-findlib.0e64370f80f1a836827d8cb9e521113396b7e5636b26af955dea79cbe0832a7c
+#+ocamlbuild.218b28a5fd79197fe9c94ace583ae9cdac258aee4e71024115a4a34467ca0566
+#+opam.45111d16ecab2ebc78b157affa52e1c4a9a3325fccb1891aaf2081406fe1c0e9
+#+ocaml-topkg.58fecb25f20f2c26d43b2d425e84e5c5bec5c75f09c47eb6a65c5d9f30396a4b
 #@untar:-j:sha256:097cb2802e3701ead9572e1b483d5a28c6e2f0a39449faaf9b44ad8a89834d88:.
 
 
diff --git a/variants/root-x86_64/ocaml-ppx_derivers b/variants/root-x86_64/ocaml-ppx_derivers
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.6766642c1ca9d7b64ef185bd45a18c55379cb02eb5a74f016fc67c726f049865
-#+dune.8c4e2bf379ae3da0b215aac7a77daffcb74e12361a359c2b3f095a83be957fc4
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+ocaml.78527b89669f21a6d7c489de475e980a5939a86a3e1f47e7dc6ce48ca6a53739
+#+dune.24dd22350eb03f161d73dbc88c6f1180095c6d73cd438b11350dd64767c4e93a
 #@untar:-z:sha256:b6595ee187dea792b31fc54a0e1524ab1e48bc6068d3066c45215a138cc73b95:.
 
 
diff --git a/variants/root-x86_64/ocaml-ppx_deriving b/variants/root-x86_64/ocaml-ppx_deriving
@@ -1,45 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.6766642c1ca9d7b64ef185bd45a18c55379cb02eb5a74f016fc67c726f049865
-#+dune.8c4e2bf379ae3da0b215aac7a77daffcb74e12361a359c2b3f095a83be957fc4
-#+ocaml-compiler-libs.45f5679ed32d5f344a09ac54d137afc377590485c0a1aa41cff62fbb19e09597
-#+ocaml-cppo.e8137c6b39e6278a8f189e7feabe66b58f2fd93a65dd083f31011b931f0b965e
-#+ocaml-findlib.fc5a9b799a288326c7aa0e887e896ddad578c8ced7cbe8005f75cd534cf1d1a2
-#+ocaml-ppx_derivers.795ad631fa221ca64709081eb71443ded253e80eaafc84e381bb5c4fb6ecaa3b
-#+ocaml-ppxlib.3d1a3aa676b68bc426d1020ff2a7e9b35f1cad1f17472ad275fd08ac4aba2599
-#+ocaml-sexplib0.162d1ad761b435b2d0da96b1cb43648ba6738f2be1bc2166a267df8577e11db6
-#+ocaml-stdlib-shims.32e80367e164aa9f448793674ab653fc252ad23f89070ca1f8de1cf4a094dccc
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+ocaml.78527b89669f21a6d7c489de475e980a5939a86a3e1f47e7dc6ce48ca6a53739
+#+dune.24dd22350eb03f161d73dbc88c6f1180095c6d73cd438b11350dd64767c4e93a
+#+ocaml-compiler-libs.3093e99e53c6fc67324743d03131acca685af22d4f00a78dc387d3cb4463d815
+#+ocaml-cppo.800d02666fbcadf03894929799ef1cc3144f4cffa686b2fcf2baa14a7d5afed7
+#+ocaml-findlib.0e64370f80f1a836827d8cb9e521113396b7e5636b26af955dea79cbe0832a7c
+#+ocaml-ppx_derivers.a83d0a48631db13dd5ad92ba9bd5d16c69c2482c06360003c8381016786b1963
+#+ocaml-ppxlib.24f18125531a623057134a167dc697afe2890b740807d20ae60d69a52c0e105b
+#+ocaml-sexplib0.523256ead397b1e5ce631166cbc73c6bbadcce527d00814d1eea4e36eaf2aa6f
+#+ocaml-stdlib-shims.8d7d417ba5be8606ec849b412fc1d2003a44451ecc936eb9277713debe1c6267
 #@untar:-z:sha256:c91d1ea5e15e6928a2f8947dbd135b9f765cc0e2d72be271427981afcd350c24:.
 
 
diff --git a/variants/root-x86_64/ocaml-ppxlib b/variants/root-x86_64/ocaml-ppxlib
@@ -1,42 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.6766642c1ca9d7b64ef185bd45a18c55379cb02eb5a74f016fc67c726f049865
-#+dune.8c4e2bf379ae3da0b215aac7a77daffcb74e12361a359c2b3f095a83be957fc4
-#+ocaml-compiler-libs.45f5679ed32d5f344a09ac54d137afc377590485c0a1aa41cff62fbb19e09597
-#+ocaml-ppx_derivers.795ad631fa221ca64709081eb71443ded253e80eaafc84e381bb5c4fb6ecaa3b
-#+ocaml-sexplib0.162d1ad761b435b2d0da96b1cb43648ba6738f2be1bc2166a267df8577e11db6
-#+ocaml-stdlib-shims.32e80367e164aa9f448793674ab653fc252ad23f89070ca1f8de1cf4a094dccc
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+ocaml.78527b89669f21a6d7c489de475e980a5939a86a3e1f47e7dc6ce48ca6a53739
+#+dune.24dd22350eb03f161d73dbc88c6f1180095c6d73cd438b11350dd64767c4e93a
+#+ocaml-compiler-libs.3093e99e53c6fc67324743d03131acca685af22d4f00a78dc387d3cb4463d815
+#+ocaml-ppx_derivers.a83d0a48631db13dd5ad92ba9bd5d16c69c2482c06360003c8381016786b1963
+#+ocaml-sexplib0.523256ead397b1e5ce631166cbc73c6bbadcce527d00814d1eea4e36eaf2aa6f
+#+ocaml-stdlib-shims.8d7d417ba5be8606ec849b412fc1d2003a44451ecc936eb9277713debe1c6267
 #@untar:-j:sha256:2e223837e7cecc3bc84a432432c0a72f4e1d5be9165c9c33772f156db85db0b3:.
 
 
diff --git a/variants/root-x86_64/ocaml-rresult b/variants/root-x86_64/ocaml-rresult
@@ -1,41 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.6766642c1ca9d7b64ef185bd45a18c55379cb02eb5a74f016fc67c726f049865
-#+ocaml-findlib.fc5a9b799a288326c7aa0e887e896ddad578c8ced7cbe8005f75cd534cf1d1a2
-#+ocamlbuild.4744a973661de01f3d5000a0949b2728959b4a5e8f61d5d90dab5e79853bd1b1
-#+opam.b6fa21f6056616833a0b71204d85c8fd7a3fd0c4015ba02945ea2f7013dbe91b
-#+ocaml-topkg.3006e629706042d687935b8bd450b0d9107bbe9bb9cf35b7c0982bc4d4454c50
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+ocaml.78527b89669f21a6d7c489de475e980a5939a86a3e1f47e7dc6ce48ca6a53739
+#+ocaml-findlib.0e64370f80f1a836827d8cb9e521113396b7e5636b26af955dea79cbe0832a7c
+#+ocamlbuild.218b28a5fd79197fe9c94ace583ae9cdac258aee4e71024115a4a34467ca0566
+#+opam.45111d16ecab2ebc78b157affa52e1c4a9a3325fccb1891aaf2081406fe1c0e9
+#+ocaml-topkg.58fecb25f20f2c26d43b2d425e84e5c5bec5c75f09c47eb6a65c5d9f30396a4b
 #@untar:-j:sha256:11aa7f5b83460e60431e3154e3e32c071d46e151ea5760cf24377805bf975540:.
 
 
diff --git a/variants/root-x86_64/ocaml-sexplib0 b/variants/root-x86_64/ocaml-sexplib0
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.6766642c1ca9d7b64ef185bd45a18c55379cb02eb5a74f016fc67c726f049865
-#+dune.8c4e2bf379ae3da0b215aac7a77daffcb74e12361a359c2b3f095a83be957fc4
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+ocaml.78527b89669f21a6d7c489de475e980a5939a86a3e1f47e7dc6ce48ca6a53739
+#+dune.24dd22350eb03f161d73dbc88c6f1180095c6d73cd438b11350dd64767c4e93a
 #@untar:-z:sha256:86dba26468194512f789f2fb709063515a9cb4e5c4461c021c239a369590701d:.
 
 
diff --git a/variants/root-x86_64/ocaml-stdlib-shims b/variants/root-x86_64/ocaml-stdlib-shims
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.6766642c1ca9d7b64ef185bd45a18c55379cb02eb5a74f016fc67c726f049865
-#+dune.8c4e2bf379ae3da0b215aac7a77daffcb74e12361a359c2b3f095a83be957fc4
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+ocaml.78527b89669f21a6d7c489de475e980a5939a86a3e1f47e7dc6ce48ca6a53739
+#+dune.24dd22350eb03f161d73dbc88c6f1180095c6d73cd438b11350dd64767c4e93a
 #@untar:-j:sha256:babf72d3917b86f707885f0c5528e36c63fccb698f4b46cf2bab5c7ccdd6d84a:.
 
 
diff --git a/variants/root-x86_64/ocaml-topkg b/variants/root-x86_64/ocaml-topkg
@@ -1,40 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.6766642c1ca9d7b64ef185bd45a18c55379cb02eb5a74f016fc67c726f049865
-#+ocaml-findlib.fc5a9b799a288326c7aa0e887e896ddad578c8ced7cbe8005f75cd534cf1d1a2
-#+ocamlbuild.4744a973661de01f3d5000a0949b2728959b4a5e8f61d5d90dab5e79853bd1b1
-#+opam.b6fa21f6056616833a0b71204d85c8fd7a3fd0c4015ba02945ea2f7013dbe91b
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+ocaml.78527b89669f21a6d7c489de475e980a5939a86a3e1f47e7dc6ce48ca6a53739
+#+ocaml-findlib.0e64370f80f1a836827d8cb9e521113396b7e5636b26af955dea79cbe0832a7c
+#+ocamlbuild.218b28a5fd79197fe9c94ace583ae9cdac258aee4e71024115a4a34467ca0566
+#+opam.45111d16ecab2ebc78b157affa52e1c4a9a3325fccb1891aaf2081406fe1c0e9
 #@untar:-j:sha256:452082626e651ac4b1633c2b4ae4cad7abeb1fb6a13046e699f95eec58b5d1c7:.
 
 
diff --git a/variants/root-x86_64/ocaml.environment b/variants/root-x86_64/ocaml.environment
@@ -1,9 +1,9 @@
 #!/usr/bin/env pthbs-build
-#+ocaml.6766642c1ca9d7b64ef185bd45a18c55379cb02eb5a74f016fc67c726f049865
-#+dune.8c4e2bf379ae3da0b215aac7a77daffcb74e12361a359c2b3f095a83be957fc4
-#+ocamlbuild.4744a973661de01f3d5000a0949b2728959b4a5e8f61d5d90dab5e79853bd1b1
-#+ocaml-base.e5985319dcd5c63081a28ee733812474a421df3568964398883e2be45c905fbd
-#+opam.b6fa21f6056616833a0b71204d85c8fd7a3fd0c4015ba02945ea2f7013dbe91b
-#+ocaml-bos.6108b1ad564e53769f072f9fcd106bc6c612bd82d698b3af6e7a2c6b7e304e99
-#+ocaml-lun.d2bcdb6b9e95a86a67f46ecfa1cada24e214187dde12927f6a63a3be7cfe766e
-#+ocaml-ppx_deriving.80b80d29af2a2a89e6bb6f748f3f62db6a8e46eb96cee667a1f045ba50b9abe8-
\ No newline at end of file
+#+ocaml.78527b89669f21a6d7c489de475e980a5939a86a3e1f47e7dc6ce48ca6a53739
+#+dune.24dd22350eb03f161d73dbc88c6f1180095c6d73cd438b11350dd64767c4e93a
+#+ocamlbuild.218b28a5fd79197fe9c94ace583ae9cdac258aee4e71024115a4a34467ca0566
+#+ocaml-base.504b5474cfd5c0ac8002e608eeeca71378927395c666f74c265ea17862c81b48
+#+opam.45111d16ecab2ebc78b157affa52e1c4a9a3325fccb1891aaf2081406fe1c0e9
+#+ocaml-bos.2c3372725ac73d29042861c8d6db498233d8ab0d7bfb9d2d10613984955aae89
+#+ocaml-lun.ef828cf5a4482236b642fb6cf59d2ed563e44ea943225c5a97b422a50169c2b1
+#+ocaml-ppx_deriving.80ed100c64440e4b81d188971d67c59eab41d8777eb64a831de3ec1d3e56490d+
\ No newline at end of file
diff --git a/variants/root-x86_64/ocaml:dynlink b/variants/root-x86_64/ocaml:dynlink
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+m4.27f0a202490d82b1635b7cb459d4b9673a51d756911654acf07fe347f47eea0b
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+m4.4ae4e28c98413d9ffde8b4aa5f50af10935690f4a459ad8d7005ebb7299e8767
 #@untar:-J:sha256:dfaa8a2e11c799bc1765d8bef44911406ee5f4803027190382a939f88c912266:.
 
 
diff --git a/variants/root-x86_64/ocaml_intrinsics_kernel b/variants/root-x86_64/ocaml_intrinsics_kernel
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.6766642c1ca9d7b64ef185bd45a18c55379cb02eb5a74f016fc67c726f049865
-#+dune.8c4e2bf379ae3da0b215aac7a77daffcb74e12361a359c2b3f095a83be957fc4
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+ocaml.78527b89669f21a6d7c489de475e980a5939a86a3e1f47e7dc6ce48ca6a53739
+#+dune.24dd22350eb03f161d73dbc88c6f1180095c6d73cd438b11350dd64767c4e93a
 #@untar:-z:sha256:c988b7769a59749631c3c98ba5edd1d2fe91f5dc380b5e0593c073c92f4bee01:.
 
 
diff --git a/variants/root-x86_64/ocamlbuild b/variants/root-x86_64/ocamlbuild
@@ -1,39 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+m4.27f0a202490d82b1635b7cb459d4b9673a51d756911654acf07fe347f47eea0b
-#+ocaml.6766642c1ca9d7b64ef185bd45a18c55379cb02eb5a74f016fc67c726f049865
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+m4.4ae4e28c98413d9ffde8b4aa5f50af10935690f4a459ad8d7005ebb7299e8767
+#+ocaml.78527b89669f21a6d7c489de475e980a5939a86a3e1f47e7dc6ce48ca6a53739
 #@untar:-z:sha256:2ba6857f2991b7f69368e8db818b163d31cf5a367f15f5953bf8f01a77b3d4fc:.
 
 
@@ -77,7 +75,7 @@ make configure \
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
 # workaround ocamlbuild manpage getting installed to stdlib directory
-stdlib="$pthbs_destdir/versions/ocaml.6766642c1ca9d7b64ef185bd45a18c55379cb02eb5a74f016fc67c726f049865"
+stdlib="$pthbs_destdir/versions/ocaml.78527b89669f21a6d7c489de475e980a5939a86a3e1f47e7dc6ce48ca6a53739"
 mkdir -p "${stdlib%/*}"
 ln -s "$pthbs_package" "$stdlib"
 
diff --git a/variants/root-x86_64/opam b/variants/root-x86_64/opam
@@ -1,41 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+diffutils.a121b3cebda43b7cf8f0a8772b8e7af487aa8749a9d8359f267adda0e6c1744c
-#+patch.257395a41b2f69d0f903104f1c9853be8c9f5fc06526da68ab358bc1be11d61a
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+getconf.fda245b2b4ba565d975427411db09ef6d746f548a127ae7fbbae4494095c84df
-#+ocaml.6766642c1ca9d7b64ef185bd45a18c55379cb02eb5a74f016fc67c726f049865
-#+dune.8c4e2bf379ae3da0b215aac7a77daffcb74e12361a359c2b3f095a83be957fc4
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+diffutils.b40fc194bca7de598b5bec3c9680c1e8e1f46b8c30fd22afdf3cd2b776a635e8
+#+patch.2cfd03acd16d0d89685bd0c80dc9fcacb2f3f9802eb0e4011a1af6549f1e08b1
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+getconf.c00bd5a9aed97955f027a7610828ab557d2be26c14aa46976a00d8687e34821c
+#+ocaml.78527b89669f21a6d7c489de475e980a5939a86a3e1f47e7dc6ce48ca6a53739
+#+dune.24dd22350eb03f161d73dbc88c6f1180095c6d73cd438b11350dd64767c4e93a
 #@untar:-z:sha256:c4d053029793c714e4e7340b1157428c0f90783585fb17f35158247a640467d9:.
 
 
@@ -74,7 +72,7 @@ export DUNE_CACHE=disabled
 	--infodir="$prefix/info" \
 	--localedir="$prefix/locale" \
 	--localstatedir='/var/pthbs' \
-	--with-dune='/versions/dune.8c4e2bf379ae3da0b215aac7a77daffcb74e12361a359c2b3f095a83be957fc4/command/dune' \
+	--with-dune='/versions/dune.24dd22350eb03f161d73dbc88c6f1180095c6d73cd438b11350dd64767c4e93a/command/dune' \
 	--with-mccs \
 	--with-vendored-deps \
 	--enable-static
diff --git a/variants/root-x86_64/patch b/variants/root-x86_64/patch
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+m4.27f0a202490d82b1635b7cb459d4b9673a51d756911654acf07fe347f47eea0b
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+m4.4ae4e28c98413d9ffde8b4aa5f50af10935690f4a459ad8d7005ebb7299e8767
 #@untar:-J:sha256:ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd:.
 
 
diff --git a/variants/root-x86_64/pkgconf b/variants/root-x86_64/pkgconf
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+m4.27f0a202490d82b1635b7cb459d4b9673a51d756911654acf07fe347f47eea0b
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+m4.4ae4e28c98413d9ffde8b4aa5f50af10935690f4a459ad8d7005ebb7299e8767
 #@untar:-J:sha256:3a224f2accf091b77a5781316e27b9ee3ba82c083cc2e539e08940b68a44fec5:.
 
 
diff --git a/variants/root-x86_64/pkgconf-pkg-config b/variants/root-x86_64/pkgconf-pkg-config
@@ -1,31 +1,31 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+pkgconf.d42173f7dc4229fef2ff264c233fc3123c9fc1e92451b5e97c086d395b4d3bf6
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+pkgconf.e0d2e66c5268b1327974750527e8388ca2b0dac8cee9ab8373fa8dbf0671339e
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/popt b/variants/root-x86_64/popt
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+m4.27f0a202490d82b1635b7cb459d4b9673a51d756911654acf07fe347f47eea0b
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+m4.4ae4e28c98413d9ffde8b4aa5f50af10935690f4a459ad8d7005ebb7299e8767
 #@untar:-z:sha256:c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9:.
 
 
diff --git a/variants/root-x86_64/pthbs-banginstall b/variants/root-x86_64/pthbs-banginstall
@@ -1,33 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+zsh.327d156100e047d8eeecfc7ccc6adf0e987c046293930c08b4fe0883c6d68983
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+zsh.f093a067c8d91b8705b929d9c894f92946352174bd7f2d815431abb53a1485de
 #@sha256:1e021bddaf5c020ede9107656494715236a894557b99035365fc999605541b2d:pthbs-banginstall
 
 
diff --git a/variants/root-x86_64/rsync b/variants/root-x86_64/rsync
@@ -1,41 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+m4.27f0a202490d82b1635b7cb459d4b9673a51d756911654acf07fe347f47eea0b
-#+nawk.78c5902874518e02880ef4bad71e8db0bc9519f111546bb8d27e8127aa279ab6
-#+popt.495188e33f4e91188ee0cdf05dba24c013cebd0ad7ef7c855c1b6da3af659e30
-#+libressl.38a57d0a723d44b51732f8f0a130dc427259f0a14242a9d27cd2a8ca2375256c
-#+zstd.c6ec354ea78537add9e8d82140cc06feb56411df9e401d2ef1043468768a7780
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+m4.4ae4e28c98413d9ffde8b4aa5f50af10935690f4a459ad8d7005ebb7299e8767
+#+nawk.6fef16603f8152ffa26c1752689b1976932bc9312b681e2d543a309db3d5f522
+#+popt.2f87ec93331c59d5e15cfa7796f8883f42db121ea5a3d37760d1c07e8cb17f6e
+#+libressl.3268ed19558e6e83802d9a8a91b45387bcdc8ba859a3c76025317984bfd4d6c3
+#+zstd.0fa40e39da3442c34d2afde37dc16288ed90ad6c54cbb77b93a120ef10df712e
 #@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:.
 
 
diff --git a/variants/root-x86_64/s6 b/variants/root-x86_64/s6
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+skalibs.6afe334a070e1566d76daee15d00171a6f6a99f1752e88a80d04378a585dfa77
-#+execline.2dab6919e5c6a8d2bbcf40f011bf2c0865fffc8c9f2f761a492304a4597193a7
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+skalibs.069d912bafcaf66a7702f7e9f011cee986805a343f48a310b6358f066a25e2b3
+#+execline.35dcb24605d37b6008fce8c9a796d579eb71c2b8fdd5f98f7facd1e9269b8337
 #@git:0e02fe0e92b8f9a619fc355babad2c78c009c1f1:s6
 
 
@@ -49,7 +47,7 @@ cd 's6'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.6afe334a070e1566d76daee15d00171a6f6a99f1752e88a80d04378a585dfa77/sysdeps' \
+	--with-sysdeps='/versions/skalibs.069d912bafcaf66a7702f7e9f011cee986805a343f48a310b6358f066a25e2b3/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/root-x86_64/s6-dns b/variants/root-x86_64/s6-dns
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+skalibs.6afe334a070e1566d76daee15d00171a6f6a99f1752e88a80d04378a585dfa77
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+skalibs.069d912bafcaf66a7702f7e9f011cee986805a343f48a310b6358f066a25e2b3
 #@git:dc80225c0a78346300d100f0bf0182ed338c4b01:s6-dns
 
 
@@ -48,7 +46,7 @@ cd 's6-dns'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.6afe334a070e1566d76daee15d00171a6f6a99f1752e88a80d04378a585dfa77/sysdeps' \
+	--with-sysdeps='/versions/skalibs.069d912bafcaf66a7702f7e9f011cee986805a343f48a310b6358f066a25e2b3/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/root-x86_64/s6-linux-init b/variants/root-x86_64/s6-linux-init
@@ -1,39 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+skalibs.6afe334a070e1566d76daee15d00171a6f6a99f1752e88a80d04378a585dfa77
-#+execline.2dab6919e5c6a8d2bbcf40f011bf2c0865fffc8c9f2f761a492304a4597193a7
-#+s6.bc027c0b76a325e17e0f7392c2756257d7c8b758c960430f116c4bd87038d5a2
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+skalibs.069d912bafcaf66a7702f7e9f011cee986805a343f48a310b6358f066a25e2b3
+#+execline.35dcb24605d37b6008fce8c9a796d579eb71c2b8fdd5f98f7facd1e9269b8337
+#+s6.88f5178c72bb586930f096007d40023594e9e22e4ce60486295b861230d6141c
 #@git:b298e515efe16210048e504e3aec89ea1e627b73:s6-linux-init
 
 
@@ -50,7 +48,7 @@ cd 's6-linux-init'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.6afe334a070e1566d76daee15d00171a6f6a99f1752e88a80d04378a585dfa77/sysdeps' \
+	--with-sysdeps='/versions/skalibs.069d912bafcaf66a7702f7e9f011cee986805a343f48a310b6358f066a25e2b3/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/root-x86_64/s6-linux-utils b/variants/root-x86_64/s6-linux-utils
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+skalibs.6afe334a070e1566d76daee15d00171a6f6a99f1752e88a80d04378a585dfa77
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+skalibs.069d912bafcaf66a7702f7e9f011cee986805a343f48a310b6358f066a25e2b3
 #@git:a9e7acac41a8854546246dd39cb4daee54ead2cb:s6-linux-utils
 
 
@@ -48,7 +46,7 @@ cd 's6-linux-utils'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.6afe334a070e1566d76daee15d00171a6f6a99f1752e88a80d04378a585dfa77/sysdeps' \
+	--with-sysdeps='/versions/skalibs.069d912bafcaf66a7702f7e9f011cee986805a343f48a310b6358f066a25e2b3/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/root-x86_64/s6-networking b/variants/root-x86_64/s6-networking
@@ -1,41 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+skalibs.6afe334a070e1566d76daee15d00171a6f6a99f1752e88a80d04378a585dfa77
-#+execline.2dab6919e5c6a8d2bbcf40f011bf2c0865fffc8c9f2f761a492304a4597193a7
-#+s6.bc027c0b76a325e17e0f7392c2756257d7c8b758c960430f116c4bd87038d5a2
-#+s6-dns.5dc351415b1ff8258bc90eabf498b9d694d2d8526a65f2586d416dd21462c341
-#+libressl.38a57d0a723d44b51732f8f0a130dc427259f0a14242a9d27cd2a8ca2375256c
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+skalibs.069d912bafcaf66a7702f7e9f011cee986805a343f48a310b6358f066a25e2b3
+#+execline.35dcb24605d37b6008fce8c9a796d579eb71c2b8fdd5f98f7facd1e9269b8337
+#+s6.88f5178c72bb586930f096007d40023594e9e22e4ce60486295b861230d6141c
+#+s6-dns.abab231612702e5214d35c529abbd760877b909f556abc8c81f818dc12444d26
+#+libressl.3268ed19558e6e83802d9a8a91b45387bcdc8ba859a3c76025317984bfd4d6c3
 #@git:12b40106ed1727274cd6af379c4ba0ca7161700b:s6-networking
 
 
@@ -52,7 +50,7 @@ cd 's6-networking'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.6afe334a070e1566d76daee15d00171a6f6a99f1752e88a80d04378a585dfa77/sysdeps' \
+	--with-sysdeps='/versions/skalibs.069d912bafcaf66a7702f7e9f011cee986805a343f48a310b6358f066a25e2b3/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/root-x86_64/s6-portable-utils b/variants/root-x86_64/s6-portable-utils
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+skalibs.6afe334a070e1566d76daee15d00171a6f6a99f1752e88a80d04378a585dfa77
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+skalibs.069d912bafcaf66a7702f7e9f011cee986805a343f48a310b6358f066a25e2b3
 #@git:dc96d8a020e83b16dd7a8bd093bdb00ab2b944c0:s6-portable-utils
 
 
@@ -48,7 +46,7 @@ cd 's6-portable-utils'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.6afe334a070e1566d76daee15d00171a6f6a99f1752e88a80d04378a585dfa77/sysdeps' \
+	--with-sysdeps='/versions/skalibs.069d912bafcaf66a7702f7e9f011cee986805a343f48a310b6358f066a25e2b3/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/root-x86_64/s6-rc b/variants/root-x86_64/s6-rc
@@ -1,39 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+skalibs.6afe334a070e1566d76daee15d00171a6f6a99f1752e88a80d04378a585dfa77
-#+execline.2dab6919e5c6a8d2bbcf40f011bf2c0865fffc8c9f2f761a492304a4597193a7
-#+s6.bc027c0b76a325e17e0f7392c2756257d7c8b758c960430f116c4bd87038d5a2
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+skalibs.069d912bafcaf66a7702f7e9f011cee986805a343f48a310b6358f066a25e2b3
+#+execline.35dcb24605d37b6008fce8c9a796d579eb71c2b8fdd5f98f7facd1e9269b8337
+#+s6.88f5178c72bb586930f096007d40023594e9e22e4ce60486295b861230d6141c
 #@git:a4756f00b3823952580d1fee704675c6f813a248:s6-rc
 
 
@@ -50,7 +48,7 @@ cd 's6-rc'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.6afe334a070e1566d76daee15d00171a6f6a99f1752e88a80d04378a585dfa77/sysdeps' \
+	--with-sysdeps='/versions/skalibs.069d912bafcaf66a7702f7e9f011cee986805a343f48a310b6358f066a25e2b3/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/root-x86_64/skalibs b/variants/root-x86_64/skalibs
@@ -1,36 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
 #@git:96b537f42695da1b865588baf591fdfcae76bd41:skalibs
 
 
diff --git a/variants/root-x86_64/snaprep b/variants/root-x86_64/snaprep
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+zsh.327d156100e047d8eeecfc7ccc6adf0e987c046293930c08b4fe0883c6d68983
-#+pthbs-banginstall.bcdce5af9233608b987295f2ed937c31fc00a74fd5aa14253d47cc21ace004ea
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+zsh.f093a067c8d91b8705b929d9c894f92946352174bd7f2d815431abb53a1485de
+#+pthbs-banginstall.71828bbb33047db02a8a5a77c75c03f2936be3714a9e5ce4f827f204fd641533
 #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep
 
 
diff --git a/variants/root-x86_64/squashfs-tools b/variants/root-x86_64/squashfs-tools
@@ -1,39 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+attr.1e6f32b65a71bc6b684d9fc74ec71f0435ca24d4e79b62b098ff52596d10d208
-#+zstd.c6ec354ea78537add9e8d82140cc06feb56411df9e401d2ef1043468768a7780
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+attr.a614cbe43366009d61ef9e4414621bcfe32e40eafad47e51392e57ce30bc5493
+#+zstd.0fa40e39da3442c34d2afde37dc16288ed90ad6c54cbb77b93a120ef10df712e
 #@untar:-z:sha256:4672b5c47d9418d3a5ae5b243defc6d9eae8275b9771022247c6a6082c815914:.
 
 
diff --git a/variants/root-x86_64/strace b/variants/root-x86_64/strace
@@ -1,40 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+m4.27f0a202490d82b1635b7cb459d4b9673a51d756911654acf07fe347f47eea0b
-#+patch.257395a41b2f69d0f903104f1c9853be8c9f5fc06526da68ab358bc1be11d61a
-#+libunwind.8246543a8de1bfdbd7d968286cb026d8e058cdc679a5ae2bc54ca2e4b30b947f
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+m4.4ae4e28c98413d9ffde8b4aa5f50af10935690f4a459ad8d7005ebb7299e8767
+#+patch.2cfd03acd16d0d89685bd0c80dc9fcacb2f3f9802eb0e4011a1af6549f1e08b1
+#+libunwind.2979d0f2bf8b546dd13ea27a60cf7cedbc001d518153dfbb7a38f4e91c8fb29a
 #@sha256:37d93db7135d47852dbe763f1b18b3aeab142431a6f5268a17fc700387a326e4:strace-6.5-static.patch
 #@untar:-J:sha256:e209daf0ee038ca5adcc4c277e9273b4d51f46a2ff86da575d36742ac3508a17:.
 
diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config
@@ -1,67 +1,67 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-dosfstools.51ae6c1b897b61a65e52fe1867ebaeb2b7129e3b2b00e1118651d9bd011fc0e7
-#+busybox-e2fsprogs.57511c62d2721493f67d82e7465c20bc041f9b7642350f408d8a9498b4ae6b1f
-#+busybox-iproute2.ae76a929509894a9042994f88a9bfbd499d2589a48a68017f29e2af24cbf1b58
-#+busybox-iputils.2f1e875a68289723897606a0fcb921d38bc67b14707a78e18b1de8d91005cda4
-#+busybox-net-misc.de2f5c6384b8e8c70a1c2ad6d027ad0c50109ea95c649297f55257f2736aff84
-#+busybox-net-tools.f7c055b657de06ef2bf81f6402afe78a9e89addf12956f66fa7ebfbe26ef3222
-#+busybox-traceroute.e46d0e67d086c1a195ed0763bb52e9a74f06d28aeaf1a1c746bb17bfa0e2ca9b
-#+busybox-wget.a9e82d6bfedd9d0efec6d8bad11a5ccc50c01f96df7b23f0a9348aacd07dd78f
-#+busybox-chpst.4e4af9a70d109f6c2959c89b2e3cd577a382dec26e165631eaf00ee8f309113a
-#+busybox-console.fe9161b5896d9c52ead9d9ac22702036ed0573f9825c6221d3b39fca0834a2b1
-#+busybox-getty.c9e6d1b5f90374377bbc86c725af4589ab8da489a44a9ed485bcee2588222dc6
-#+busybox-i2c-tools.1ced7e745272b49a031cd14d8bb7b159018576f73e68601d6577215d3afbb9e7
-#+busybox-linux-extra.a4daaefe0a8f448bc4acf27e5de328de4611093ec3462fcf073d84c8761800e7
-#+busybox-mtd-utils.def4ab7f42c38ee13602f92e1d1c71c363f10f5aafb11dbb7e2b77541fc6202d
-#+busybox-shadow.51dae647f5d67da7ddef7413dc3b664f0c958cb99b9a0a4fe651b81be13d48b6
-#+busybox-su.124cfc7487bd56030e786be3207217deec1aea7026d2d9ba2866d97919ceae53
-#+busybox-util-linux-priv.2fa8487f5bb7412433c285282acd00857a6406b5f1aeb8eb94f733201f38b3e6
-#+busybox-logging.4b8f2db51b1c133dcb116b129f70c42b0235be90a5b93319db5653cf44cb00d5
-#+busybox-cron.7242ab370d42aefd0899d346a4fe14c4d42b1e4666ceb448a70b5f759a2e8c5c
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+nawk.78c5902874518e02880ef4bad71e8db0bc9519f111546bb8d27e8127aa279ab6
-#+diffutils.a121b3cebda43b7cf8f0a8772b8e7af487aa8749a9d8359f267adda0e6c1744c
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+aat.91d5450e2b53b6f5b9589e5af677d31da584b22e3d517a49d3ac4d3d1e928e5d
-#+fileset.5378d994f1355b0c64fb608929dc43f2e30df1ba91f8db80eca7fc9d9ecd3f9c
-#+rsync.abb640b022ca32a19a7323211846022ec3e9b6d90379565df2f72c9f1f7e3851
-#+execline.2dab6919e5c6a8d2bbcf40f011bf2c0865fffc8c9f2f761a492304a4597193a7
-#+kbd.01d9e7556a0446e93f6aab130759971917a26faf624dc60c489783bb52a7b735
-#+mdevd.bff4a945d357beb45c35b039c90fe64ce9b8f79edf9f3598af9f093be68ea991
-#+s6-linux-utils.12dcc381cb5fef3994ae191797e7373cea55df7e4e4564d697f5465039850aad
-#+s6-rc.f275c9b2ec0786d19935ee6bd53012974c3205699f52dfa76b8ce75dbe5768bb
-#+s6.bc027c0b76a325e17e0f7392c2756257d7c8b758c960430f116c4bd87038d5a2
-#+zsh.327d156100e047d8eeecfc7ccc6adf0e987c046293930c08b4fe0883c6d68983
-#+libcgroup.81bfdb18243e5461c8d40b74ef1af26fc51fa653529ec44a6b9ded34a2523d03
-#+system-config-scripts.549963a5cd46073cabbad2941d81712aeec813c286fcde5d2503a22937b86fea
-#+logincaps.9f0ee3fb92476fd974f9231b7b60e3e7098af6d1abe7208814f0ec98ee2b679d
-#+busybox-modutils.0d677f3a8bf4039a7280592d1db2fd10b026f9c7b923afa1b17ad4cd8548c0af
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-dosfstools.b0181361412ee80b8fbdeaf2de8c88abefb186161e14c99b3d2648951b294fe9
+#+busybox-e2fsprogs.709b765c4fc220a61c01e5aadb8b41bcd49906a5f0c8ee421d006567dc8121d3
+#+busybox-iproute2.e1c214fc23b2d5d41561b96ae1b0303b53c0804013d66478b12e0d1d34c5e0d9
+#+busybox-iputils.2bab9fbef05e48e219d19d533e8e86cbd68d21dacd1f4bce089cf24cacfe34bf
+#+busybox-net-misc.ae70546784dc33051eec77b83f9cf60fb97f3185af016e372a24ce9f078c77a7
+#+busybox-net-tools.07e53b619ee6dcafac7325ca15c095086f107d15d788c722a1d408ac50f6d0ca
+#+busybox-traceroute.502ef0a4f41187e629a32161c3b8ace008768dcfa98ea8122dd25e5ac61598ab
+#+busybox-wget.4cb39f7f861f581e7d3c6cc9ae93aa77671b626ffabae3d4a73a2d965445e0c7
+#+busybox-chpst.c5f6784b9b7fd6fba34266d08f882752f01a59f68634cdafe5c7760982f95fb7
+#+busybox-console.a0fa6ea977606c6ed873ea9132a87c4f914f6df5c4e298fa5c808c2fd3d3e131
+#+busybox-getty.9c1fff8e7a25032b557d06a0c8375ec44b7d6e0086d3b87dddb67603d79bc021
+#+busybox-i2c-tools.a616cc21a2b196044f0feb186394fcd616401c20b8f5dae9531a05117deb2880
+#+busybox-linux-extra.6e7b9586add776b2876b84a25401b43b99a4de1a16b849a1d9d77c115d2e2ffa
+#+busybox-mtd-utils.53c25959689167a04e532117e89e8d530779b1c41a0bf164cf97f54ce4eac258
+#+busybox-shadow.5222fc3744f686acbe55485b3fea2a496811c930531b3f80a8917b1efbe8c7b7
+#+busybox-su.af59f292f440c415615f599540d498fb30b66d145fb292faddc93cd297d83b3d
+#+busybox-util-linux-priv.fa7c738761e017bbdeade7ef0d4fcf50cc61fffa5e3ab6da5827ce61e8f39ebb
+#+busybox-logging.8e56e9820e6c7dc0a7256bbb153f82b08a1e2a5f9e87165d2fe98e8b1767a648
+#+busybox-cron.d04a4c03f7b1f674d35f71b1d30d0c76b378d3a7b9d4acedd583b8fb2c1e294b
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+nawk.6fef16603f8152ffa26c1752689b1976932bc9312b681e2d543a309db3d5f522
+#+diffutils.b40fc194bca7de598b5bec3c9680c1e8e1f46b8c30fd22afdf3cd2b776a635e8
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+aat.f20da3ae140a2abf6a989872623636400be84d148b362060d2f3ac1277c6fc7b
+#+fileset.9d268386c0971bf6812475860e281506d8e3df5f13bf0fe698031e2bb5cb9946
+#+rsync.f0b541ec30aba45436cee1e1c676596c117b838c8de715f4facd4abacf0cdea5
+#+execline.35dcb24605d37b6008fce8c9a796d579eb71c2b8fdd5f98f7facd1e9269b8337
+#+kbd.5ebd5c43a085e393fde70f2da68284ed2f7fa79c05edec6ea2c4cd0f39730af7
+#+mdevd.5aa81fb35128da367473e15e78a8f8291a4f59212c58331a7ac22b92896b5bc1
+#+s6-linux-utils.d3cf43fae32e55ab9e4096d5a340eabb95ef48ac2ad0d4f2ebf203d182b0099c
+#+s6-rc.d1d7537d81897440bf66b607f2dd8a6c1f1d0128504a70484fa1b9afb4f4dafa
+#+s6.88f5178c72bb586930f096007d40023594e9e22e4ce60486295b861230d6141c
+#+zsh.f093a067c8d91b8705b929d9c894f92946352174bd7f2d815431abb53a1485de
+#+libcgroup.a81ab4d062ee031312a43c9d742d6a6d6273d36b6c43b9e4e82f172216b4a4ca
+#+system-config-scripts.8d51fb98f5bdf39018b199868d2b19a0ef136f2ec06e86bde2a38e0f68f79f5f
+#+logincaps.e38b33b0412066e99af6abab2e88f0861d8dc296905866dbea75a6ccf55d1169
+#+busybox-modutils.608f36343ec828f6b7d3ba3195bc2514c93595f795e19ceddd46191668e1d88c
 #@git:055d24bac572481d7dedba7d4ec9df37f620fbfd:system-config
 
 
@@ -98,8 +98,8 @@ printf '%s\n' >config/etc/skel/loginexec \
 chmod +x config/etc/skel/loginexec
 
 env 'pthbs_path_system-config'="$prefix" \
-	'pthbs_path_containers=/versions/env.9c9c9fc573e57d1a4f4b478406aa508b5cee10bd4c768b50015a2ceccc5c95f9' \
-	'pthbs_path_mdevd=/versions/env.507b468b7898f8c69d9c423dd9ef51e40519302a4df8a4d84236c63e773c98ba' \
+	'pthbs_path_containers=/versions/env.77e2aaa770f22dbcaf00ce698aba9e9154534985d69bf8f50e5e015a11961f3d' \
+	'pthbs_path_mdevd=/versions/env.769ed54571dceb576b1063d9d5ce340d8aea3c9160a7806a2c01a83864250097' \
 	make -j${JOBS:-1} -l$((1+${JOBS:-1})) all
 
 sort -u build/execfile | while IFS= read exename; do
diff --git a/variants/root-x86_64/system-config-init b/variants/root-x86_64/system-config-init
@@ -1,57 +1,57 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-dosfstools.51ae6c1b897b61a65e52fe1867ebaeb2b7129e3b2b00e1118651d9bd011fc0e7
-#+busybox-e2fsprogs.57511c62d2721493f67d82e7465c20bc041f9b7642350f408d8a9498b4ae6b1f
-#+busybox-iproute2.ae76a929509894a9042994f88a9bfbd499d2589a48a68017f29e2af24cbf1b58
-#+busybox-iputils.2f1e875a68289723897606a0fcb921d38bc67b14707a78e18b1de8d91005cda4
-#+busybox-net-misc.de2f5c6384b8e8c70a1c2ad6d027ad0c50109ea95c649297f55257f2736aff84
-#+busybox-net-tools.f7c055b657de06ef2bf81f6402afe78a9e89addf12956f66fa7ebfbe26ef3222
-#+busybox-traceroute.e46d0e67d086c1a195ed0763bb52e9a74f06d28aeaf1a1c746bb17bfa0e2ca9b
-#+busybox-wget.a9e82d6bfedd9d0efec6d8bad11a5ccc50c01f96df7b23f0a9348aacd07dd78f
-#+busybox-chpst.4e4af9a70d109f6c2959c89b2e3cd577a382dec26e165631eaf00ee8f309113a
-#+busybox-console.fe9161b5896d9c52ead9d9ac22702036ed0573f9825c6221d3b39fca0834a2b1
-#+busybox-getty.c9e6d1b5f90374377bbc86c725af4589ab8da489a44a9ed485bcee2588222dc6
-#+busybox-i2c-tools.1ced7e745272b49a031cd14d8bb7b159018576f73e68601d6577215d3afbb9e7
-#+busybox-linux-extra.a4daaefe0a8f448bc4acf27e5de328de4611093ec3462fcf073d84c8761800e7
-#+busybox-mtd-utils.def4ab7f42c38ee13602f92e1d1c71c363f10f5aafb11dbb7e2b77541fc6202d
-#+busybox-shadow.51dae647f5d67da7ddef7413dc3b664f0c958cb99b9a0a4fe651b81be13d48b6
-#+busybox-su.124cfc7487bd56030e786be3207217deec1aea7026d2d9ba2866d97919ceae53
-#+busybox-util-linux-priv.2fa8487f5bb7412433c285282acd00857a6406b5f1aeb8eb94f733201f38b3e6
-#+busybox-logging.4b8f2db51b1c133dcb116b129f70c42b0235be90a5b93319db5653cf44cb00d5
-#+busybox-cron.7242ab370d42aefd0899d346a4fe14c4d42b1e4666ceb448a70b5f759a2e8c5c
-#+s6.bc027c0b76a325e17e0f7392c2756257d7c8b758c960430f116c4bd87038d5a2
-#+s6-rc.f275c9b2ec0786d19935ee6bd53012974c3205699f52dfa76b8ce75dbe5768bb
-#+s6-portable-utils.e9bd90a169690c6f092143e5e577f27117cbdcdb19d0f8bea39638c4aa3d765c
-#+s6-linux-init.1d7478793eb38023d64a3220182dec7e15ad664891aece6d4120011b87d9dddc
-#+execline.2dab6919e5c6a8d2bbcf40f011bf2c0865fffc8c9f2f761a492304a4597193a7
-#+system-config-rc.4101969617d9fc4e14f0d02edc165b2a242e21e4c1c94394ab04bf9bda9e510a
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-dosfstools.b0181361412ee80b8fbdeaf2de8c88abefb186161e14c99b3d2648951b294fe9
+#+busybox-e2fsprogs.709b765c4fc220a61c01e5aadb8b41bcd49906a5f0c8ee421d006567dc8121d3
+#+busybox-iproute2.e1c214fc23b2d5d41561b96ae1b0303b53c0804013d66478b12e0d1d34c5e0d9
+#+busybox-iputils.2bab9fbef05e48e219d19d533e8e86cbd68d21dacd1f4bce089cf24cacfe34bf
+#+busybox-net-misc.ae70546784dc33051eec77b83f9cf60fb97f3185af016e372a24ce9f078c77a7
+#+busybox-net-tools.07e53b619ee6dcafac7325ca15c095086f107d15d788c722a1d408ac50f6d0ca
+#+busybox-traceroute.502ef0a4f41187e629a32161c3b8ace008768dcfa98ea8122dd25e5ac61598ab
+#+busybox-wget.4cb39f7f861f581e7d3c6cc9ae93aa77671b626ffabae3d4a73a2d965445e0c7
+#+busybox-chpst.c5f6784b9b7fd6fba34266d08f882752f01a59f68634cdafe5c7760982f95fb7
+#+busybox-console.a0fa6ea977606c6ed873ea9132a87c4f914f6df5c4e298fa5c808c2fd3d3e131
+#+busybox-getty.9c1fff8e7a25032b557d06a0c8375ec44b7d6e0086d3b87dddb67603d79bc021
+#+busybox-i2c-tools.a616cc21a2b196044f0feb186394fcd616401c20b8f5dae9531a05117deb2880
+#+busybox-linux-extra.6e7b9586add776b2876b84a25401b43b99a4de1a16b849a1d9d77c115d2e2ffa
+#+busybox-mtd-utils.53c25959689167a04e532117e89e8d530779b1c41a0bf164cf97f54ce4eac258
+#+busybox-shadow.5222fc3744f686acbe55485b3fea2a496811c930531b3f80a8917b1efbe8c7b7
+#+busybox-su.af59f292f440c415615f599540d498fb30b66d145fb292faddc93cd297d83b3d
+#+busybox-util-linux-priv.fa7c738761e017bbdeade7ef0d4fcf50cc61fffa5e3ab6da5827ce61e8f39ebb
+#+busybox-logging.8e56e9820e6c7dc0a7256bbb153f82b08a1e2a5f9e87165d2fe98e8b1767a648
+#+busybox-cron.d04a4c03f7b1f674d35f71b1d30d0c76b378d3a7b9d4acedd583b8fb2c1e294b
+#+s6.88f5178c72bb586930f096007d40023594e9e22e4ce60486295b861230d6141c
+#+s6-rc.d1d7537d81897440bf66b607f2dd8a6c1f1d0128504a70484fa1b9afb4f4dafa
+#+s6-portable-utils.b9bda7b30d532a39d5663110b7541a7242d71c5908ef45fa0bb8f0727ecf5c7f
+#+s6-linux-init.1d662b3311ca787c0b85e5ec668f9a92522b35800fe488ef1c89ecd27c69234b
+#+execline.35dcb24605d37b6008fce8c9a796d579eb71c2b8fdd5f98f7facd1e9269b8337
+#+system-config-rc.37a61fa6cb61479f61e7c034aa80a291b3f766e3bbdb1d2f4ce181d02d77bc4a
 
 
 # - build script start -
@@ -76,7 +76,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-s6rcdb=/versions/system-config-rc.4101969617d9fc4e14f0d02edc165b2a242e21e4c1c94394ab04bf9bda9e510a/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.37a61fa6cb61479f61e7c034aa80a291b3f766e3bbdb1d2f4ce181d02d77bc4a/config/s6-rc-db
 
 # Generate init (${dest} must not exist but parent dir does)
 mkdir -p "$pthbs_destdir//versions"
diff --git a/variants/root-x86_64/system-config-rc b/variants/root-x86_64/system-config-rc
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+s6-rc.f275c9b2ec0786d19935ee6bd53012974c3205699f52dfa76b8ce75dbe5768bb
-#+fileset.5378d994f1355b0c64fb608929dc43f2e30df1ba91f8db80eca7fc9d9ecd3f9c
-#+system-config.75cd8e7f6cbbfff475ac6be6cda65d8907523c1fb651569b4652196d2e0e2a7d
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+s6-rc.d1d7537d81897440bf66b607f2dd8a6c1f1d0128504a70484fa1b9afb4f4dafa
+#+fileset.9d268386c0971bf6812475860e281506d8e3df5f13bf0fe698031e2bb5cb9946
+#+system-config.6734bbf844e880322f461056aff6f24ea3664e9bb763dd65edb5c31d81f24182
 
 
 # - build script start -
@@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-src=/versions/system-config.75cd8e7f6cbbfff475ac6be6cda65d8907523c1fb651569b4652196d2e0e2a7d/config/s6-rc-source
+src=/versions/system-config.6734bbf844e880322f461056aff6f24ea3664e9bb763dd65edb5c31d81f24182/config/s6-rc-source
 s6-rc-compile ./s6-rc-db "$src"
 mkdir -p "$dest/config"
 mv -v s6-rc-db "$dest/config/"
diff --git a/variants/root-x86_64/system-config-scripts b/variants/root-x86_64/system-config-scripts
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+zsh.327d156100e047d8eeecfc7ccc6adf0e987c046293930c08b4fe0883c6d68983
-#+pthbs-banginstall.bcdce5af9233608b987295f2ed937c31fc00a74fd5aa14253d47cc21ace004ea
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+zsh.f093a067c8d91b8705b929d9c894f92946352174bd7f2d815431abb53a1485de
+#+pthbs-banginstall.71828bbb33047db02a8a5a77c75c03f2936be3714a9e5ce4f827f204fd641533
 #@git:dc793695cc0632a808af9d4415f3b0cf0f4dfba2:system-config-scripts
 
 
diff --git a/variants/root-x86_64/system-config-zsh b/variants/root-x86_64/system-config-zsh
@@ -1,33 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+zsh.327d156100e047d8eeecfc7ccc6adf0e987c046293930c08b4fe0883c6d68983
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+zsh.f093a067c8d91b8705b929d9c894f92946352174bd7f2d815431abb53a1485de
 #@git:6dfbe33079e2f8c64c5daed29aa1ea3e7e3f2d59:system-config-zsh
 
 
diff --git a/variants/root-x86_64/tinyssh b/variants/root-x86_64/tinyssh
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
 #@untar:-z:sha256:f3ae622c765db4e0d791ea90a9feba39d7f693ef9cb949a797f7ad6b404a2d61:.
 
 
diff --git a/variants/root-x86_64/user-env b/variants/root-x86_64/user-env
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+execline.2dab6919e5c6a8d2bbcf40f011bf2c0865fffc8c9f2f761a492304a4597193a7
-#+pthbs-banginstall.bcdce5af9233608b987295f2ed937c31fc00a74fd5aa14253d47cc21ace004ea
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+execline.35dcb24605d37b6008fce8c9a796d579eb71c2b8fdd5f98f7facd1e9269b8337
+#+pthbs-banginstall.71828bbb33047db02a8a5a77c75c03f2936be3714a9e5ce4f827f204fd641533
 #@sha256:664430d033e0b491a5ed90cb39cb17cddb57ac0be9f3f2bf014264f3c17d55df:user-env
 
 
diff --git a/variants/root-x86_64/userspace.environment b/variants/root-x86_64/userspace.environment
@@ -1,93 +1,91 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-dosfstools.51ae6c1b897b61a65e52fe1867ebaeb2b7129e3b2b00e1118651d9bd011fc0e7
-#+busybox-e2fsprogs.57511c62d2721493f67d82e7465c20bc041f9b7642350f408d8a9498b4ae6b1f
-#+busybox-iproute2.ae76a929509894a9042994f88a9bfbd499d2589a48a68017f29e2af24cbf1b58
-#+busybox-iputils.2f1e875a68289723897606a0fcb921d38bc67b14707a78e18b1de8d91005cda4
-#+busybox-net-misc.de2f5c6384b8e8c70a1c2ad6d027ad0c50109ea95c649297f55257f2736aff84
-#+busybox-net-tools.f7c055b657de06ef2bf81f6402afe78a9e89addf12956f66fa7ebfbe26ef3222
-#+busybox-traceroute.e46d0e67d086c1a195ed0763bb52e9a74f06d28aeaf1a1c746bb17bfa0e2ca9b
-#+busybox-wget.a9e82d6bfedd9d0efec6d8bad11a5ccc50c01f96df7b23f0a9348aacd07dd78f
-#+busybox-chpst.4e4af9a70d109f6c2959c89b2e3cd577a382dec26e165631eaf00ee8f309113a
-#+busybox-console.fe9161b5896d9c52ead9d9ac22702036ed0573f9825c6221d3b39fca0834a2b1
-#+busybox-getty.c9e6d1b5f90374377bbc86c725af4589ab8da489a44a9ed485bcee2588222dc6
-#+busybox-i2c-tools.1ced7e745272b49a031cd14d8bb7b159018576f73e68601d6577215d3afbb9e7
-#+busybox-linux-extra.a4daaefe0a8f448bc4acf27e5de328de4611093ec3462fcf073d84c8761800e7
-#+busybox-mtd-utils.def4ab7f42c38ee13602f92e1d1c71c363f10f5aafb11dbb7e2b77541fc6202d
-#+busybox-shadow.51dae647f5d67da7ddef7413dc3b664f0c958cb99b9a0a4fe651b81be13d48b6
-#+busybox-su.124cfc7487bd56030e786be3207217deec1aea7026d2d9ba2866d97919ceae53
-#+busybox-util-linux-priv.2fa8487f5bb7412433c285282acd00857a6406b5f1aeb8eb94f733201f38b3e6
-#+busybox-logging.4b8f2db51b1c133dcb116b129f70c42b0235be90a5b93319db5653cf44cb00d5
-#+busybox-cron.7242ab370d42aefd0899d346a4fe14c4d42b1e4666ceb448a70b5f759a2e8c5c
-#+attr.1e6f32b65a71bc6b684d9fc74ec71f0435ca24d4e79b62b098ff52596d10d208
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+diffutils.a121b3cebda43b7cf8f0a8772b8e7af487aa8749a9d8359f267adda0e6c1744c
-#+patch.257395a41b2f69d0f903104f1c9853be8c9f5fc06526da68ab358bc1be11d61a
-#+flex.d134786b76d557c083764809f126b4b87622d65686b721dd4265e8153af0ad8b
-#+bison.66947d10baf6f9f669c4bdb21dd7d808b01a4f1795910294166b37b3ca99863f
-#+rsync.abb640b022ca32a19a7323211846022ec3e9b6d90379565df2f72c9f1f7e3851
-#+execline.2dab6919e5c6a8d2bbcf40f011bf2c0865fffc8c9f2f761a492304a4597193a7
-#+s6.bc027c0b76a325e17e0f7392c2756257d7c8b758c960430f116c4bd87038d5a2
-#+s6-rc.f275c9b2ec0786d19935ee6bd53012974c3205699f52dfa76b8ce75dbe5768bb
-#+s6-portable-utils.e9bd90a169690c6f092143e5e577f27117cbdcdb19d0f8bea39638c4aa3d765c
-#+s6-linux-utils.12dcc381cb5fef3994ae191797e7373cea55df7e4e4564d697f5465039850aad
-#+s6-linux-init.1d7478793eb38023d64a3220182dec7e15ad664891aece6d4120011b87d9dddc
-#+mdevd.bff4a945d357beb45c35b039c90fe64ce9b8f79edf9f3598af9f093be68ea991
-#+s6-dns.5dc351415b1ff8258bc90eabf498b9d694d2d8526a65f2586d416dd21462c341
-#+libressl.38a57d0a723d44b51732f8f0a130dc427259f0a14242a9d27cd2a8ca2375256c
-#+s6-networking.a7c2e7379bf16023f84fea5ea8e65d6fb7ce0ce068088f7f769e5bca73afabb5
-#+zsh.327d156100e047d8eeecfc7ccc6adf0e987c046293930c08b4fe0883c6d68983
-#+pthbs-banginstall.bcdce5af9233608b987295f2ed937c31fc00a74fd5aa14253d47cc21ace004ea
-#+aat.91d5450e2b53b6f5b9589e5af677d31da584b22e3d517a49d3ac4d3d1e928e5d
-#+confz.fadcbca8051d36890bbdb3a787efcbd154b62046da3607a9b361cce7907176e4
-#+containers.500f4fb71e330d72f40aa66e1dd3074afbef037af1d02f62872b041484245eb3
-#+fileset.5378d994f1355b0c64fb608929dc43f2e30df1ba91f8db80eca7fc9d9ecd3f9c
-#+logincaps.9f0ee3fb92476fd974f9231b7b60e3e7098af6d1abe7208814f0ec98ee2b679d
-#+snaprep.a82119175f780645fe8c18aefc2738009f711c8d6fa4332c42f28ab6ddeaf44b
-#+curl.44a6fdac6a194de983394771a8b649d5c1ab7e7335fb60c34d06af7ae1200e01
-#+git.dfeaebcfe5b9da10deddf299fa3786125256dbd2f45d065a92341eb4c8cccfd8
-#+xbps.c0d1ba5ccaf97cc331c617e357589ff230832641ea138afd2b5957bbccef9d20
-#+apk-tools.e04ee1e5428558bde1ca9d3c46b29328be14ced4c417385c61863920ad73cb49
-#+getent.308c5e84e6153460a029b2a80b660d653634146ec1f83c30d28e1501be925b3e
-#+getconf.fda245b2b4ba565d975427411db09ef6d746f548a127ae7fbbae4494095c84df
-#+iconv.d44636bff8a1458e751975ae2d5f4bfc2d113505aaf09bd592e09856379885ce
-#+libcap.af7837f04e1b8914be888ac898e2254c463e29db71397a3945044078a12de259
-#+applyuidgid-caps.9b8d6d1e6d645b4766e2b4b4048c3fd084dd3697f221ec4b3d4e4a7ea98b4f0f
-#+ccx-utils.e86caf5af7cfef9e19b6378975368bb3e3cb9975289d9757509dd5a81e27c228
-#+user-env.566cfc95e9d4abba23af86dfc6a764c65ab436a93014cdeea857b809286fd7fa
-#+strace.a8b1584baf720485706de6c04fa384ca6c54a7829d9ad1b019bab2a3794a8c6f
-#+mlog.b386be229184abe7b741bf232a9d346291f79b7ec07053b22a6053c1f17106ca
-#+findutils.35709e9badd93cf847be4b7f7e01b6bfe5a1971db097c44d53973067ea43b375
-#+nawk.78c5902874518e02880ef4bad71e8db0bc9519f111546bb8d27e8127aa279ab6
-#+nvi.733c9c33b03aa2a9ddb8a2dd07032844469c5676d752c8ba71412efb3596f46a
-#+squashfs-tools.e659a2ed7c1182abee5113c1cf054da3b7132d73f8b3e378626622f06d6b69a3
-#+mandoc.e29b7924ba5f4fd40157aedf70b40e6c29c68d5b8906fd1c1d2875d4ec118436
-#+tinyssh.8ad7bb3057999d5e122643cf619eaa101e23191c7b2a6bc460051b543c91b933-
\ No newline at end of file
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-dosfstools.b0181361412ee80b8fbdeaf2de8c88abefb186161e14c99b3d2648951b294fe9
+#+busybox-e2fsprogs.709b765c4fc220a61c01e5aadb8b41bcd49906a5f0c8ee421d006567dc8121d3
+#+busybox-iproute2.e1c214fc23b2d5d41561b96ae1b0303b53c0804013d66478b12e0d1d34c5e0d9
+#+busybox-iputils.2bab9fbef05e48e219d19d533e8e86cbd68d21dacd1f4bce089cf24cacfe34bf
+#+busybox-net-misc.ae70546784dc33051eec77b83f9cf60fb97f3185af016e372a24ce9f078c77a7
+#+busybox-net-tools.07e53b619ee6dcafac7325ca15c095086f107d15d788c722a1d408ac50f6d0ca
+#+busybox-traceroute.502ef0a4f41187e629a32161c3b8ace008768dcfa98ea8122dd25e5ac61598ab
+#+busybox-wget.4cb39f7f861f581e7d3c6cc9ae93aa77671b626ffabae3d4a73a2d965445e0c7
+#+busybox-chpst.c5f6784b9b7fd6fba34266d08f882752f01a59f68634cdafe5c7760982f95fb7
+#+busybox-console.a0fa6ea977606c6ed873ea9132a87c4f914f6df5c4e298fa5c808c2fd3d3e131
+#+busybox-getty.9c1fff8e7a25032b557d06a0c8375ec44b7d6e0086d3b87dddb67603d79bc021
+#+busybox-i2c-tools.a616cc21a2b196044f0feb186394fcd616401c20b8f5dae9531a05117deb2880
+#+busybox-linux-extra.6e7b9586add776b2876b84a25401b43b99a4de1a16b849a1d9d77c115d2e2ffa
+#+busybox-mtd-utils.53c25959689167a04e532117e89e8d530779b1c41a0bf164cf97f54ce4eac258
+#+busybox-shadow.5222fc3744f686acbe55485b3fea2a496811c930531b3f80a8917b1efbe8c7b7
+#+busybox-su.af59f292f440c415615f599540d498fb30b66d145fb292faddc93cd297d83b3d
+#+busybox-util-linux-priv.fa7c738761e017bbdeade7ef0d4fcf50cc61fffa5e3ab6da5827ce61e8f39ebb
+#+busybox-logging.8e56e9820e6c7dc0a7256bbb153f82b08a1e2a5f9e87165d2fe98e8b1767a648
+#+busybox-cron.d04a4c03f7b1f674d35f71b1d30d0c76b378d3a7b9d4acedd583b8fb2c1e294b
+#+attr.a614cbe43366009d61ef9e4414621bcfe32e40eafad47e51392e57ce30bc5493
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+diffutils.b40fc194bca7de598b5bec3c9680c1e8e1f46b8c30fd22afdf3cd2b776a635e8
+#+patch.2cfd03acd16d0d89685bd0c80dc9fcacb2f3f9802eb0e4011a1af6549f1e08b1
+#+flex.18feadf9d7f890bdc4c3e5417bdf1a8afeb229f1c96901651a515f6f5f2124d4
+#+bison.c5d6f5d738972d9013147f31f59909f6939ed9dacfd666c338d3739b7272e42d
+#+rsync.f0b541ec30aba45436cee1e1c676596c117b838c8de715f4facd4abacf0cdea5
+#+execline.35dcb24605d37b6008fce8c9a796d579eb71c2b8fdd5f98f7facd1e9269b8337
+#+s6.88f5178c72bb586930f096007d40023594e9e22e4ce60486295b861230d6141c
+#+s6-rc.d1d7537d81897440bf66b607f2dd8a6c1f1d0128504a70484fa1b9afb4f4dafa
+#+s6-portable-utils.b9bda7b30d532a39d5663110b7541a7242d71c5908ef45fa0bb8f0727ecf5c7f
+#+s6-linux-utils.d3cf43fae32e55ab9e4096d5a340eabb95ef48ac2ad0d4f2ebf203d182b0099c
+#+s6-linux-init.1d662b3311ca787c0b85e5ec668f9a92522b35800fe488ef1c89ecd27c69234b
+#+mdevd.5aa81fb35128da367473e15e78a8f8291a4f59212c58331a7ac22b92896b5bc1
+#+s6-dns.abab231612702e5214d35c529abbd760877b909f556abc8c81f818dc12444d26
+#+libressl.3268ed19558e6e83802d9a8a91b45387bcdc8ba859a3c76025317984bfd4d6c3
+#+s6-networking.929d13919868b5eb2f3f7dd48cf01175ef54c78830e08972b1a51ae00f6a2621
+#+zsh.f093a067c8d91b8705b929d9c894f92946352174bd7f2d815431abb53a1485de
+#+pthbs-banginstall.71828bbb33047db02a8a5a77c75c03f2936be3714a9e5ce4f827f204fd641533
+#+aat.f20da3ae140a2abf6a989872623636400be84d148b362060d2f3ac1277c6fc7b
+#+confz.40f3ebf52896f6a22b670d1f88618ab80acb7b6f8f001e7c7d66cae2cbb2beb2
+#+containers.948b0d7db1d3eba9d22c692fa2673ffdd9e732aa18357d75264424d4d58f5ae2
+#+fileset.9d268386c0971bf6812475860e281506d8e3df5f13bf0fe698031e2bb5cb9946
+#+logincaps.e38b33b0412066e99af6abab2e88f0861d8dc296905866dbea75a6ccf55d1169
+#+snaprep.03529cf9b1f25ae25cc577df0dc780884824de425003a32b8ad2cef994800a21
+#+curl.10aff6a71692cd6e2f4e930a96bd17c64cf6d795a886b5439fa2bed45ae10229
+#+git.0683d31487071cdeef442a4aa19024ce0881fa64ae875abdd623692e67177da4
+#+xbps.d4a879631e49c4778f7e3d01af68d042569ed18a07db8e1bdc5af0c891e2ebff
+#+apk-tools.209b79078e3a2fe8315e3daa561a853e3ee8649a2b612ea0693b674bec4ec3fb
+#+getent.7ec91acdc0b635eb7b6d4a4426ea49a92c28ea645be9f69e79807531a0e47973
+#+getconf.c00bd5a9aed97955f027a7610828ab557d2be26c14aa46976a00d8687e34821c
+#+iconv.8d4cb8c614a7098c0ba72035571ef410a0e715ed16449cf605266f3ee8f0261c
+#+libcap.978d71a77c9256c0e2187ae8d62922216b7411d4a5f17d2896628c732db4df11
+#+applyuidgid-caps.696bad813e560742aad37d71466e3703bf2eddc9886f052cdb7bbc64b55f65d1
+#+ccx-utils.060f7e168f078cdfdf66be335af7b653e99efe25a8bfc2f060c67dc40f65985a
+#+user-env.6adc0caf53bec1dbe5bd05680e69bac3e723a611e4839c521e6fc6d4603611e4
+#+strace.7fb8b1a8e6e9921b9c07de2c85d4b9b6b2d5d5c2e972902ea62330bce63f9bff
+#+mlog.d1a0d0432092e86b4985cd44454841378ac7e4c3549e83f0a10d70d29a1c0a40
+#+findutils.98530703c3d88a35fdf650055f75ff7e9c18174ab9a91bf6447603cc7b5bffe4
+#+nawk.6fef16603f8152ffa26c1752689b1976932bc9312b681e2d543a309db3d5f522
+#+nvi.2e75bcdd397841a16e132ddc400b496e20d3bb01589c44ce2b8e2048268df046
+#+squashfs-tools.7abec6a90f571f56ee9c7926e5e01fb4c88de1a7ffeea3285afe58e60df3ded4
+#+mandoc.3085f92f95ca1858fe73d1b773c2deb4a25ce2fe8df3831ee27cd5dd085f0ebd
+#+tinyssh.14d90628d7e34b809bff027d37a32a62dd57d996585b694f367bfbdf149462fb+
\ No newline at end of file
diff --git a/variants/root-x86_64/vm.environment b/variants/root-x86_64/vm.environment
@@ -1,2 +1,2 @@
 #!/usr/bin/env pthbs-build
-#+linux-qemu-guest.f8ebef8c68a33c0a3d8b1764070b3ba5a450805c6751bef9338592dc4ef33987-
\ No newline at end of file
+#+linux-qemu-guest.246c004ebb26c33c97f3902d884ad8839b32f82bd37a78af1ee1ac570295dbb8+
\ No newline at end of file
diff --git a/variants/root-x86_64/xbps b/variants/root-x86_64/xbps
@@ -1,39 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+libarchive.341b79fd5f788cf304bc0bc3944fb9ee193329615c120b13dfdcfec33cb56a04
-#+libressl.38a57d0a723d44b51732f8f0a130dc427259f0a14242a9d27cd2a8ca2375256c
-#+pkgconf-pkg-config.0bd26bb5368082438ebcaae7551b1454a03981fc8d8ee799d48d834a26aee1ec
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+libarchive.46b07699c536aab29294fb96a702107351961f2ecd56a93bccb55ba955e5892b
+#+libressl.3268ed19558e6e83802d9a8a91b45387bcdc8ba859a3c76025317984bfd4d6c3
+#+pkgconf-pkg-config.8e5c8881361e43bcf5473fa80e75f7aff454d13f9a951d65b42d0d279d6d52bc
 #@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:.
 
 
diff --git a/variants/root-x86_64/zsh b/variants/root-x86_64/zsh
@@ -1,40 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+m4.27f0a202490d82b1635b7cb459d4b9673a51d756911654acf07fe347f47eea0b
-#+netbsd-curses.9e35f0bdfc9f1003a23f6fc0fc7fad40f5dc48fec27e9c12d0ba521555764d5c
-#+libbsd.2f02332061a56fd4c8ca6b91c41bc995381b78b299d65e1761de8d30b1eedff4
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+m4.4ae4e28c98413d9ffde8b4aa5f50af10935690f4a459ad8d7005ebb7299e8767
+#+netbsd-curses.c469b70a4e0e4bdc287dbb56603a6a8f2c002f390d6df4e94b85d0002c27d0af
+#+libbsd.c7e557c62225a0c75511eac94f77f7d6802c7caedb274678a90ed874b28a3804
 #@git:c73505cc47870bd09e8e204d98ac5976e0d4cb52:zsh_config
 #@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:.
 
diff --git a/variants/root-x86_64/zstd b/variants/root-x86_64/zstd
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.a55770d0f8ec084778895fff2c4b9e8c372ded9d78b6d3f337d4a32f00d5c805
-#+busybox-bzip2.839f700ac8503ecc5874cbe93c95f951272e0b014534d1f7e3843afa7dc40694
-#+busybox-gzip.421954679bb7b94b3165ee0a1485b1af67a696bbefc9651a788c25b3c17dbfa8
-#+busybox-lzop.322c2e95c285d69a4999b1155358b78646baaba2d07c540f6c18fc45aea56300
-#+busybox-unzip.bea8c75ebd00711b6014ad192a9a15eae81513886420597082816a2d6f008b47
-#+busybox-xz.3829d14b33b4b7d3f809c5dc55a66e144e8911252a5f1c8aad6272f97ecee2e6
-#+busybox-cpio.43587dcdf8873d79f2bea87fedf82f49911db2356bf774e624aed5fd3343ae3b
-#+busybox-dpkg.dee11463053ae5771fabcb68a4ff5fc49dbb43aa835ddfd6b6d93349abc84a27
-#+busybox-rpm.91451e56d4cff259588a2fc7731d38897741b4ce1236d152f3066a6efa32300e
-#+busybox-tar.94ef1cbb2244b08d3384515d0c467ef27721e0feaef708fefdcc36fc93d0e315
-#+busybox-ed.a4d97447b472c41e7654794300e774e4e9ecc9adb58117f912afd40bb385e041
-#+busybox-sed.8a2bb3b475664617adb9d8b30bd3544ccba97796bd2504fc22277885833f8148
-#+busybox-vi.2132a60b37998ee090522b78f170acf472e3d6b355353d492dcf549754dfbf73
-#+busybox-xxd.91f6002d52596e5b19c322bf3f834630fb39ee9d0de5682a8baedd950944d9ad
-#+busybox-process-extra.e6ea0e0bdbf7aa22f3a632b5669a7328c0c1710472c8710d673b0c659a33fa4e
-#+busybox-procps.83f2f8100247a38d5ed03536450f89a23090ec6df1f067f52d296a2c1b0fe201
-#+busybox-psmisc.8da9338f89818b69dab0e37fbb549eb968fd52af0a753263dd3928f9d17c18db
-#+busybox-ash.770f4ca2da905375b3b6b6310b86f401527ee868619c2f105346b138395df621
-#+busybox-bc.764ce8759248156597afc45a52c9e49b2a521d547e6eecf7a1929af6b6f109cf
-#+busybox-coreutils.7b9bce58bd6b513af40bce35d95c183c8b44b66dd0bf093bb153e385675b1ee2
-#+busybox-coreutils-extra.5dcf457ad6248ffa9502125bf5c25706bf1189ed870b2431b9a0462f697a426b
-#+busybox-daemontools.df7d9e1bdf15c2c01170f46eacddc0be0fe878fae2ea7f61248f9d9928900593
-#+busybox-grep.5aff4dbd5d110a272a4f7b16ee4a54904d716d8c6e7b5c17a02b30bba8c70063
-#+busybox-misc.d5b4c3c4197064e959f243c34cf6a701c0bb1b153b9c2384f24a40846198e1e4
-#+busybox-sh.169104640ecd81c10b5e247ba0c334dd7b4435d5fdd6878f6315e5fafe12af65
-#+busybox-util-linux-unpriv.7eab3660d2ba7a1644e123f38af4c0a2db2a6ffa8165950b51bf5f1fa6de4b53
-#+busybox-findutils.8d4b0ceaa29f5245769b32b98b58f519167592252227dfd2447fd09a5ce26370
-#+busybox-awk.30e69cfe5591913675535e7ea7ffdb6f18fe1d45701d2268852deaaf5783a85f
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.873db41d06bb0d0a54a677063789969ead504ee12875229af20c54a393fa4ce1
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.069f4405eee3299e9d58d8e02b9e74794f05af601a3d3eee61f6cab850b864af
-#+busybox-diffutils.92fac84daacdb7434ae806f7be46be73de5d7f17b20b256ead5c66210879b922
+#+busybox.659af94d3b2b840dd297f2d0f37e3de3179b040f15364825a8f790c20b822f63
+#+busybox-bzip2.f2e6dc15f3fee514669911a785eb81165e26a3c1cdf503aa32d1e46109dfb647
+#+busybox-gzip.354eefdb88f748e13c9aa45623be1dfa8647c4d04f4c3363975968a6e026571c
+#+busybox-lzop.0c3c9c798c306608667140cb475537fa4cbad79af46255b30b56d3598b6e56eb
+#+busybox-unzip.4364e473578b089a0dd7a6d013c89aacb9c681e028021185956c246851c15ea5
+#+busybox-xz.32c43161d84a8e6a5ef5b771e8e063462c0d2252bb7ef4b45f184a82d07d3f48
+#+busybox-cpio.47222a7e654650a42e8ec6b90482e1a04522579276c22c4adb64cd719518a62b
+#+busybox-dpkg.3f522a25dc34b5cb636d8cb69d416f6c98042ea0498a0e7aa60a3498bcbedbfa
+#+busybox-rpm.157f4f3a469fd5c78cf6571ed4df4fbabf2f7732a755d377238788fdf9b352df
+#+busybox-tar.e3756270452874fe97b09b8eabd16db7523af7583d9ddd4884cc04f95509d593
+#+busybox-ed.665cad1dc4a08bda94a33484fe64a26f12398ce89483cfaf753be1b842fbc6d2
+#+busybox-sed.f7fae51673adbcbb3313c56f64433fc8e3a88bfbd701aaff8384b321718c03c2
+#+busybox-vi.1a07dad9cdf28fd37005a0347c79d15d8b37f5c457467598e58702618c5d22e3
+#+busybox-xxd.7b96f97f13ceb5c59b241b2e24ff0456e0fe4336f41f6ccad96a176af5c8d419
+#+busybox-process-extra.6a2daf5e96c61ef615ddc2b99059884e0d1e836031bd1184fb0a5428307cdb94
+#+busybox-procps.bdf121d5a9116e58288e83fc9255bc944479412933b5c6161a8da608c2775528
+#+busybox-psmisc.ef58210458a53c4488c9f3a2ea612fcec8cdf6db13ccd85b87c81803076d692a
+#+busybox-ash.b1a69ce4d2023cbce1f02051aedac35254a0835bd606aaaa2567b0102332ded4
+#+busybox-bc.df0a18110b55130d27ac1b5a57ce1790d4786b15e781eba6a034e0bb39146aa2
+#+busybox-coreutils.51f170491fdda4cdf807bc1288eca7c04b616cd66ff148626d21ea0553d2cb3d
+#+busybox-coreutils-extra.558133a27f403c2e73914089d1bb503547ebc6ce1216fe077aefc093a9c1d225
+#+busybox-daemontools.31ae279618af8daa0342f5330e2c99e0261b364d75af51c6bda353fefb5d2376
+#+busybox-grep.44dc96dd70543b8b425b4e5cdf7abe8aed12e5fa7bb686099b9bcaa1706dca98
+#+busybox-misc.3bb30aeb8bc66fcb5e8eb6643ddd3af5f8a8a218d3969b30070b120e383fb1ec
+#+busybox-sh.3e26543994c0060cbb0da3ff18c372ec312e3a3c1a7d56ed7f79d0f828855ae5
+#+busybox-util-linux-unpriv.10632d9237e93dc84754da862d6dd32ba4b657ce2ff5e9bc6a05e2608e16bffc
+#+busybox-findutils.4cd01eff93a7d700eb8e31f40fd821884a227619a879cef12e7d06e64e23ea3a
+#+busybox-awk.74e532d2fcfa68141bd2538ef8d5d6ebe552a2742d5d466f44e63eefd652ca64
+#+musl-cross-make.455170a4f28e20e5506fc43c301d0f901306a0b58a97e92106ea9480067b6b0b
+#+gnu-make.876854dd596c0d650bccd3cf60bb7d761420a79d3ed33462c4adfb09babdff66
+#+busybox-diffutils.739974872ace6d61c6161c14d1ff9d34392151d1dcc23eadc442ac7b01aae328
 #@untar:-z:sha256:98e9c3d949d1b924e28e01eccb7deed865eefebf25c2f21c702e5cd5b63b85e1:.

	mrrl Minimal Reliable Reproducible Linux
	git clone https://ccx.te2000.cz/git/mrrl
	Log \| Files \| Refs \| Submodules \| README