mrrl

Minimal Reliable Reproducible Linux
git clone https://ccx.te2000.cz/git/mrrl
Log | Files | Refs | Submodules | README
commit 4ed81cc4b49383964b5d52fe9657ac252ac30c99
parent 8ebcd41710c2440f54ebd3a3ed91663143471fe7
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Thu,  4 Dec 2025 01:00:39 +0000

Split toolchain packages, use macro to pick toolchain

Diffstat:

Mtemplates/autotools | 3++-


Mtemplates/autotools_static_mini | 3++-


Mtemplates/dune | 3++-


Mtemplates/functions/check_dynamic | 2+-


Mtemplates/linux | 2+-


Mtemplates/package_sets | 8+++++++-


Mtemplates/pkg/abduco | 3++-


Mtemplates/pkg/apk-tools | 3++-


Mtemplates/pkg/busybox | 3++-


Mtemplates/pkg/busybox:modutils | 3++-


Mtemplates/pkg/ccx-utils | 3++-


Mtemplates/pkg/dune | 3++-


Mtemplates/pkg/error-standalone | 3++-


Mtemplates/pkg/gcc | 20++++++++++++--------


Mtemplates/pkg/git | 3++-


Mtemplates/pkg/gnu-make | 3++-


Mtemplates/pkg/libcap | 3++-


Mtemplates/pkg/libelf | 3++-


Mtemplates/pkg/logincaps | 3++-


Mtemplates/pkg/m4 | 3++-


Mtemplates/pkg/mandoc | 3++-


Mtemplates/pkg/mlog | 3++-


Mtemplates/pkg/musl-fts | 3++-


Mtemplates/pkg/nawk | 3++-


Mtemplates/pkg/netbsd-curses | 3++-


Mtemplates/pkg/ocaml-findlib | 3++-


Mtemplates/pkg/ocaml_intrinsics_kernel | 3++-


Mtemplates/pkg/ocamlbuild | 3++-


Mtemplates/pkg/opam | 3++-


Mtemplates/pkg/openssl | 3++-


Mtemplates/pkg/rsync | 3++-


Mtemplates/pkg/skalibs | 3++-


Mtemplates/pkg/squashfs-tools | 3++-


Mtemplates/pkg/tinyssh | 3++-


Mtemplates/pkg/xbps | 3++-


Mtemplates/pkg/zstd | 3++-


Mtemplates/single_static_c | 3++-


Mtemplates/skaware | 3++-


Mtemplates/topkg | 3++-


Mvariants/ccx-x86_64/aat | 60++++++++++++++++++++++++++++++------------------------------


Mvariants/ccx-x86_64/abduco | 64+++++++++++++++++++++++++++++++++-------------------------------


Mvariants/ccx-x86_64/alpine-keys | 56++++++++++++++++++++++++++++----------------------------


Mvariants/ccx-x86_64/apk-tools | 72+++++++++++++++++++++++++++++++++++++-----------------------------------


Mvariants/ccx-x86_64/applyuidgid-caps | 64+++++++++++++++++++++++++++++++++-------------------------------


Mvariants/ccx-x86_64/argp-standalone | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/ccx-x86_64/attr | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/ccx-x86_64/bison | 68+++++++++++++++++++++++++++++++++++---------------------------------


Mvariants/ccx-x86_64/busybox | 4+++-


Mvariants/ccx-x86_64/busybox-ash | 2+-


Mvariants/ccx-x86_64/busybox-attr | 2+-


Mvariants/ccx-x86_64/busybox-awk | 2+-


Mvariants/ccx-x86_64/busybox-bc | 2+-


Mvariants/ccx-x86_64/busybox-bzip2 | 2+-


Mvariants/ccx-x86_64/busybox-chpst | 2+-


Mvariants/ccx-x86_64/busybox-console | 2+-


Mvariants/ccx-x86_64/busybox-coreutils | 2+-


Mvariants/ccx-x86_64/busybox-coreutils-extra | 2+-


Mvariants/ccx-x86_64/busybox-cpio | 2+-


Mvariants/ccx-x86_64/busybox-cron | 2+-


Mvariants/ccx-x86_64/busybox-daemontools | 2+-


Mvariants/ccx-x86_64/busybox-diffutils | 2+-


Mvariants/ccx-x86_64/busybox-dosfstools | 2+-


Mvariants/ccx-x86_64/busybox-dpkg | 2+-


Mvariants/ccx-x86_64/busybox-e2fsprogs | 2+-


Mvariants/ccx-x86_64/busybox-ed | 2+-


Mvariants/ccx-x86_64/busybox-findutils | 2+-


Mvariants/ccx-x86_64/busybox-getty | 2+-


Mvariants/ccx-x86_64/busybox-grep | 2+-


Mvariants/ccx-x86_64/busybox-gzip | 2+-


Mvariants/ccx-x86_64/busybox-i2c-tools | 2+-


Mvariants/ccx-x86_64/busybox-iproute2 | 2+-


Mvariants/ccx-x86_64/busybox-iputils | 2+-


Mvariants/ccx-x86_64/busybox-kbd | 2+-


Mvariants/ccx-x86_64/busybox-linux-extra | 2+-


Mvariants/ccx-x86_64/busybox-logging | 2+-


Mvariants/ccx-x86_64/busybox-login | 2+-


Mvariants/ccx-x86_64/busybox-lzop | 2+-


Mvariants/ccx-x86_64/busybox-misc | 2+-


Mvariants/ccx-x86_64/busybox-modutils | 2+-


Mvariants/ccx-x86_64/busybox-mtd-utils | 2+-


Mvariants/ccx-x86_64/busybox-net-misc | 2+-


Mvariants/ccx-x86_64/busybox-net-tools | 2+-


Mvariants/ccx-x86_64/busybox-process-extra | 2+-


Mvariants/ccx-x86_64/busybox-procps | 2+-


Mvariants/ccx-x86_64/busybox-psmisc | 2+-


Mvariants/ccx-x86_64/busybox-rpm | 2+-


Mvariants/ccx-x86_64/busybox-sed | 2+-


Mvariants/ccx-x86_64/busybox-sh | 2+-


Mvariants/ccx-x86_64/busybox-shadow | 2+-


Mvariants/ccx-x86_64/busybox-su | 2+-


Mvariants/ccx-x86_64/busybox-tar | 2+-


Mvariants/ccx-x86_64/busybox-traceroute | 2+-


Mvariants/ccx-x86_64/busybox-unzip | 2+-


Mvariants/ccx-x86_64/busybox-util-linux-priv | 2+-


Mvariants/ccx-x86_64/busybox-util-linux-unpriv | 2+-


Mvariants/ccx-x86_64/busybox-vi | 2+-


Mvariants/ccx-x86_64/busybox-wget | 2+-


Mvariants/ccx-x86_64/busybox-xxd | 2+-


Mvariants/ccx-x86_64/busybox-xz | 2+-


Mvariants/ccx-x86_64/busybox:modutils | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/ccx-x86_64/ca-certificates-wip-donotuse | 58+++++++++++++++++++++++++++++-----------------------------


Mvariants/ccx-x86_64/ccx-utils | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/ccx-x86_64/certdata2pem | 60+++++++++++++++++++++++++++++++-----------------------------


Mvariants/ccx-x86_64/confz | 60++++++++++++++++++++++++++++++------------------------------


Mvariants/ccx-x86_64/container-bin-image | 112++++++++++++++++++++++++++++++++++++++++----------------------------------------


Mvariants/ccx-x86_64/containers | 84++++++++++++++++++++++++++++++++++++++++----------------------------------------


Mvariants/ccx-x86_64/containers.environment | 128++++++++++++++++++++++++++++++++++++++++----------------------------------------


Mvariants/ccx-x86_64/curl | 68+++++++++++++++++++++++++++++++++++---------------------------------


Mvariants/ccx-x86_64/default.environment | 194++++++++++++++++++++++++++++++++++++++++---------------------------------------


Mvariants/ccx-x86_64/diffutils | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/ccx-x86_64/dune | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/ccx-x86_64/easyseccomp | 78++++++++++++++++++++++++++++++++++++++++--------------------------------------


Mvariants/ccx-x86_64/error-standalone | 64+++++++++++++++++++++++++++++++++-------------------------------


Mvariants/ccx-x86_64/execline | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/ccx-x86_64/fileset | 60++++++++++++++++++++++++++++++------------------------------


Mvariants/ccx-x86_64/findutils | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/ccx-x86_64/flex | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/ccx-x86_64/gcc | 20++++++++++++--------


Mvariants/ccx-x86_64/getconf | 60+++++++++++++++++++++++++++++++-----------------------------


Mvariants/ccx-x86_64/getent | 60+++++++++++++++++++++++++++++++-----------------------------


Mvariants/ccx-x86_64/git | 70++++++++++++++++++++++++++++++++++++----------------------------------


Mvariants/ccx-x86_64/gnu-make | 4+++-


Mvariants/ccx-x86_64/gperf | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/ccx-x86_64/iconv | 60+++++++++++++++++++++++++++++++-----------------------------


Mvariants/ccx-x86_64/kbd | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/ccx-x86_64/kernel.environment | 6+++---


Mvariants/ccx-x86_64/libarchive | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/ccx-x86_64/libbsd | 68+++++++++++++++++++++++++++++++++++---------------------------------


Mvariants/ccx-x86_64/libcap | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/ccx-x86_64/libcgroup | 72+++++++++++++++++++++++++++++++++++++-----------------------------------


Mvariants/ccx-x86_64/libelf | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/ccx-x86_64/libmd | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/ccx-x86_64/libressl | 70++++++++++++++++++++++++++++++++++++----------------------------------


Mvariants/ccx-x86_64/libseccomp | 70++++++++++++++++++++++++++++++++++++----------------------------------


Mvariants/ccx-x86_64/libunwind | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/ccx-x86_64/linux | 80++++++++++++++++++++++++++++++++++++++++---------------------------------------


Mvariants/ccx-x86_64/linux-qemu-guest | 80++++++++++++++++++++++++++++++++++++++++---------------------------------------


Mvariants/ccx-x86_64/logincaps | 68+++++++++++++++++++++++++++++++++++---------------------------------


Mvariants/ccx-x86_64/m4 | 64+++++++++++++++++++++++++++++++++-------------------------------


Mvariants/ccx-x86_64/mandoc | 64+++++++++++++++++++++++++++++++++-------------------------------


Mvariants/ccx-x86_64/mdev-scripts | 60++++++++++++++++++++++++++++++------------------------------


Mvariants/ccx-x86_64/mdevd | 68+++++++++++++++++++++++++++++++++++---------------------------------


Mvariants/ccx-x86_64/mdevd.environment | 102++++++++++++++++++++++++++++++++++++++++----------------------------------------


Mvariants/ccx-x86_64/mlog | 62++++++++++++++++++++++++++++++++------------------------------


Mvariants/ccx-x86_64/musl-fts | 62++++++++++++++++++++++++++++++++------------------------------


Mvariants/ccx-x86_64/nawk | 64+++++++++++++++++++++++++++++++++-------------------------------


Mvariants/ccx-x86_64/netbsd-curses | 62++++++++++++++++++++++++++++++++------------------------------


Mvariants/ccx-x86_64/ocaml-astring | 72+++++++++++++++++++++++++++++++++++++-----------------------------------


Mvariants/ccx-x86_64/ocaml-base | 70++++++++++++++++++++++++++++++++++++----------------------------------


Mvariants/ccx-x86_64/ocaml-bos | 84++++++++++++++++++++++++++++++++++++++++---------------------------------------


Mvariants/ccx-x86_64/ocaml-cmdliner | 72+++++++++++++++++++++++++++++++++++++-----------------------------------


Mvariants/ccx-x86_64/ocaml-compiler-libs | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/ccx-x86_64/ocaml-cppo | 68+++++++++++++++++++++++++++++++++++---------------------------------


Mvariants/ccx-x86_64/ocaml-findlib | 76+++++++++++++++++++++++++++++++++++++++-------------------------------------


Mvariants/ccx-x86_64/ocaml-fmt | 74++++++++++++++++++++++++++++++++++++++------------------------------------


Mvariants/ccx-x86_64/ocaml-fpath | 74++++++++++++++++++++++++++++++++++++++------------------------------------


Mvariants/ccx-x86_64/ocaml-logs | 78++++++++++++++++++++++++++++++++++++++++--------------------------------------


Mvariants/ccx-x86_64/ocaml-lun | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/ccx-x86_64/ocaml-mtime | 72+++++++++++++++++++++++++++++++++++++-----------------------------------


Mvariants/ccx-x86_64/ocaml-ppx_derivers | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/ccx-x86_64/ocaml-ppx_deriving | 80++++++++++++++++++++++++++++++++++++++++---------------------------------------


Mvariants/ccx-x86_64/ocaml-ppxlib | 74++++++++++++++++++++++++++++++++++++++------------------------------------


Mvariants/ccx-x86_64/ocaml-rresult | 72+++++++++++++++++++++++++++++++++++++-----------------------------------


Mvariants/ccx-x86_64/ocaml-sexplib0 | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/ccx-x86_64/ocaml-stdlib-shims | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/ccx-x86_64/ocaml-topkg | 70++++++++++++++++++++++++++++++++++++----------------------------------


Mvariants/ccx-x86_64/ocaml.environment | 18+++++++++---------


Mvariants/ccx-x86_64/ocaml:dynlink | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/ccx-x86_64/ocaml_intrinsics_kernel | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/ccx-x86_64/ocamlbuild | 72+++++++++++++++++++++++++++++++++++++-----------------------------------


Mvariants/ccx-x86_64/opam | 74++++++++++++++++++++++++++++++++++++++------------------------------------


Mvariants/ccx-x86_64/patch | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/ccx-x86_64/pkgconf | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/ccx-x86_64/pkgconf-pkg-config | 54+++++++++++++++++++++++++++---------------------------


Mvariants/ccx-x86_64/popt | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/ccx-x86_64/pthbs-banginstall | 58+++++++++++++++++++++++++++++-----------------------------


Mvariants/ccx-x86_64/rsync | 72+++++++++++++++++++++++++++++++++++++-----------------------------------


Mvariants/ccx-x86_64/s6 | 68+++++++++++++++++++++++++++++++++++---------------------------------


Mvariants/ccx-x86_64/s6-dns | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/ccx-x86_64/s6-linux-init | 70++++++++++++++++++++++++++++++++++++----------------------------------


Mvariants/ccx-x86_64/s6-linux-utils | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/ccx-x86_64/s6-networking | 74++++++++++++++++++++++++++++++++++++++------------------------------------


Mvariants/ccx-x86_64/s6-portable-utils | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/ccx-x86_64/s6-rc | 70++++++++++++++++++++++++++++++++++++----------------------------------


Mvariants/ccx-x86_64/skalibs | 62++++++++++++++++++++++++++++++++------------------------------


Mvariants/ccx-x86_64/snaprep | 60++++++++++++++++++++++++++++++------------------------------


Mvariants/ccx-x86_64/squashfs-tools | 68+++++++++++++++++++++++++++++++++++---------------------------------


Mvariants/ccx-x86_64/strace | 70++++++++++++++++++++++++++++++++++++----------------------------------


Mvariants/ccx-x86_64/system-config | 130++++++++++++++++++++++++++++++++++++++++----------------------------------------


Mvariants/ccx-x86_64/system-config-init | 108++++++++++++++++++++++++++++++++++++++++----------------------------------------


Mvariants/ccx-x86_64/system-config-rc | 66+++++++++++++++++++++++++++++++++---------------------------------


Mvariants/ccx-x86_64/system-config-scripts | 60++++++++++++++++++++++++++++++------------------------------


Mvariants/ccx-x86_64/system-config-zsh | 58+++++++++++++++++++++++++++++-----------------------------


Mvariants/ccx-x86_64/tinyssh | 64+++++++++++++++++++++++++++++++++-------------------------------


Mvariants/ccx-x86_64/user-env | 60++++++++++++++++++++++++++++++------------------------------


Mvariants/ccx-x86_64/userspace.environment | 182++++++++++++++++++++++++++++++++++++++++---------------------------------------


Mvariants/ccx-x86_64/vm.environment | 4++--


Mvariants/ccx-x86_64/xbps | 68+++++++++++++++++++++++++++++++++++---------------------------------


Mvariants/ccx-x86_64/zsh | 70++++++++++++++++++++++++++++++++++++----------------------------------


Mvariants/ccx-x86_64/zstd | 64+++++++++++++++++++++++++++++++++-------------------------------


Mvariants/root-x86_64/aat | 60++++++++++++++++++++++++++++++------------------------------


Mvariants/root-x86_64/abduco | 64+++++++++++++++++++++++++++++++++-------------------------------


Mvariants/root-x86_64/alpine-keys | 56++++++++++++++++++++++++++++----------------------------


Mvariants/root-x86_64/apk-tools | 72+++++++++++++++++++++++++++++++++++++-----------------------------------


Mvariants/root-x86_64/applyuidgid-caps | 64+++++++++++++++++++++++++++++++++-------------------------------


Mvariants/root-x86_64/argp-standalone | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/root-x86_64/attr | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/root-x86_64/bison | 68+++++++++++++++++++++++++++++++++++---------------------------------


Mvariants/root-x86_64/busybox | 4+++-


Mvariants/root-x86_64/busybox-ash | 2+-


Mvariants/root-x86_64/busybox-attr | 2+-


Mvariants/root-x86_64/busybox-awk | 2+-


Mvariants/root-x86_64/busybox-bc | 2+-


Mvariants/root-x86_64/busybox-bzip2 | 2+-


Mvariants/root-x86_64/busybox-chpst | 2+-


Mvariants/root-x86_64/busybox-console | 2+-


Mvariants/root-x86_64/busybox-coreutils | 2+-


Mvariants/root-x86_64/busybox-coreutils-extra | 2+-


Mvariants/root-x86_64/busybox-cpio | 2+-


Mvariants/root-x86_64/busybox-cron | 2+-


Mvariants/root-x86_64/busybox-daemontools | 2+-


Mvariants/root-x86_64/busybox-diffutils | 2+-


Mvariants/root-x86_64/busybox-dosfstools | 2+-


Mvariants/root-x86_64/busybox-dpkg | 2+-


Mvariants/root-x86_64/busybox-e2fsprogs | 2+-


Mvariants/root-x86_64/busybox-ed | 2+-


Mvariants/root-x86_64/busybox-findutils | 2+-


Mvariants/root-x86_64/busybox-getty | 2+-


Mvariants/root-x86_64/busybox-grep | 2+-


Mvariants/root-x86_64/busybox-gzip | 2+-


Mvariants/root-x86_64/busybox-i2c-tools | 2+-


Mvariants/root-x86_64/busybox-iproute2 | 2+-


Mvariants/root-x86_64/busybox-iputils | 2+-


Mvariants/root-x86_64/busybox-kbd | 2+-


Mvariants/root-x86_64/busybox-linux-extra | 2+-


Mvariants/root-x86_64/busybox-logging | 2+-


Mvariants/root-x86_64/busybox-login | 2+-


Mvariants/root-x86_64/busybox-lzop | 2+-


Mvariants/root-x86_64/busybox-misc | 2+-


Mvariants/root-x86_64/busybox-modutils | 2+-


Mvariants/root-x86_64/busybox-mtd-utils | 2+-


Mvariants/root-x86_64/busybox-net-misc | 2+-


Mvariants/root-x86_64/busybox-net-tools | 2+-


Mvariants/root-x86_64/busybox-process-extra | 2+-


Mvariants/root-x86_64/busybox-procps | 2+-


Mvariants/root-x86_64/busybox-psmisc | 2+-


Mvariants/root-x86_64/busybox-rpm | 2+-


Mvariants/root-x86_64/busybox-sed | 2+-


Mvariants/root-x86_64/busybox-sh | 2+-


Mvariants/root-x86_64/busybox-shadow | 2+-


Mvariants/root-x86_64/busybox-su | 2+-


Mvariants/root-x86_64/busybox-tar | 2+-


Mvariants/root-x86_64/busybox-traceroute | 2+-


Mvariants/root-x86_64/busybox-unzip | 2+-


Mvariants/root-x86_64/busybox-util-linux-priv | 2+-


Mvariants/root-x86_64/busybox-util-linux-unpriv | 2+-


Mvariants/root-x86_64/busybox-vi | 2+-


Mvariants/root-x86_64/busybox-wget | 2+-


Mvariants/root-x86_64/busybox-xxd | 2+-


Mvariants/root-x86_64/busybox-xz | 2+-


Mvariants/root-x86_64/ca-certificates-wip-donotuse | 58+++++++++++++++++++++++++++++-----------------------------


Mvariants/root-x86_64/ccx-utils | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/root-x86_64/certdata2pem | 60+++++++++++++++++++++++++++++++-----------------------------


Mvariants/root-x86_64/confz | 60++++++++++++++++++++++++++++++------------------------------


Mvariants/root-x86_64/container-bin-image | 112++++++++++++++++++++++++++++++++++++++++----------------------------------------


Mvariants/root-x86_64/containers | 84++++++++++++++++++++++++++++++++++++++++----------------------------------------


Mvariants/root-x86_64/containers.environment | 128++++++++++++++++++++++++++++++++++++++++----------------------------------------


Mvariants/root-x86_64/curl | 68+++++++++++++++++++++++++++++++++++---------------------------------


Mvariants/root-x86_64/default.environment | 194++++++++++++++++++++++++++++++++++++++++---------------------------------------


Mvariants/root-x86_64/diffutils | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/root-x86_64/dune | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/root-x86_64/easyseccomp | 78++++++++++++++++++++++++++++++++++++++++--------------------------------------


Mvariants/root-x86_64/error-standalone | 64+++++++++++++++++++++++++++++++++-------------------------------


Mvariants/root-x86_64/execline | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/root-x86_64/fileset | 60++++++++++++++++++++++++++++++------------------------------


Mvariants/root-x86_64/findutils | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/root-x86_64/flex | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/root-x86_64/gcc | 20++++++++++++--------


Mvariants/root-x86_64/getconf | 60+++++++++++++++++++++++++++++++-----------------------------


Mvariants/root-x86_64/getent | 60+++++++++++++++++++++++++++++++-----------------------------


Mvariants/root-x86_64/git | 70++++++++++++++++++++++++++++++++++++----------------------------------


Mvariants/root-x86_64/gnu-make | 4+++-


Mvariants/root-x86_64/gperf | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/root-x86_64/iconv | 60+++++++++++++++++++++++++++++++-----------------------------


Mvariants/root-x86_64/kbd | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/root-x86_64/libarchive | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/root-x86_64/libbsd | 68+++++++++++++++++++++++++++++++++++---------------------------------


Mvariants/root-x86_64/libcap | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/root-x86_64/libcgroup | 72+++++++++++++++++++++++++++++++++++++-----------------------------------


Mvariants/root-x86_64/libelf | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/root-x86_64/libmd | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/root-x86_64/libressl | 70++++++++++++++++++++++++++++++++++++----------------------------------


Mvariants/root-x86_64/libseccomp | 70++++++++++++++++++++++++++++++++++++----------------------------------


Mvariants/root-x86_64/libunwind | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/root-x86_64/linux-qemu-guest | 80++++++++++++++++++++++++++++++++++++++++---------------------------------------


Mvariants/root-x86_64/logincaps | 68+++++++++++++++++++++++++++++++++++---------------------------------


Mvariants/root-x86_64/m4 | 64+++++++++++++++++++++++++++++++++-------------------------------


Mvariants/root-x86_64/mandoc | 64+++++++++++++++++++++++++++++++++-------------------------------


Mvariants/root-x86_64/mdev-scripts | 60++++++++++++++++++++++++++++++------------------------------


Mvariants/root-x86_64/mdevd | 68+++++++++++++++++++++++++++++++++++---------------------------------


Mvariants/root-x86_64/mdevd.environment | 102++++++++++++++++++++++++++++++++++++++++----------------------------------------


Mvariants/root-x86_64/mlog | 62++++++++++++++++++++++++++++++++------------------------------


Mvariants/root-x86_64/musl-fts | 62++++++++++++++++++++++++++++++++------------------------------


Mvariants/root-x86_64/nawk | 64+++++++++++++++++++++++++++++++++-------------------------------


Mvariants/root-x86_64/netbsd-curses | 62++++++++++++++++++++++++++++++++------------------------------


Mvariants/root-x86_64/ocaml-astring | 72+++++++++++++++++++++++++++++++++++++-----------------------------------


Mvariants/root-x86_64/ocaml-base | 70++++++++++++++++++++++++++++++++++++----------------------------------


Mvariants/root-x86_64/ocaml-bos | 84++++++++++++++++++++++++++++++++++++++++---------------------------------------


Mvariants/root-x86_64/ocaml-cmdliner | 72+++++++++++++++++++++++++++++++++++++-----------------------------------


Mvariants/root-x86_64/ocaml-compiler-libs | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/root-x86_64/ocaml-cppo | 68+++++++++++++++++++++++++++++++++++---------------------------------


Mvariants/root-x86_64/ocaml-findlib | 76+++++++++++++++++++++++++++++++++++++++-------------------------------------


Mvariants/root-x86_64/ocaml-fmt | 74++++++++++++++++++++++++++++++++++++++------------------------------------


Mvariants/root-x86_64/ocaml-fpath | 74++++++++++++++++++++++++++++++++++++++------------------------------------


Mvariants/root-x86_64/ocaml-logs | 78++++++++++++++++++++++++++++++++++++++++--------------------------------------


Mvariants/root-x86_64/ocaml-lun | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/root-x86_64/ocaml-mtime | 72+++++++++++++++++++++++++++++++++++++-----------------------------------


Mvariants/root-x86_64/ocaml-ppx_derivers | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/root-x86_64/ocaml-ppx_deriving | 80++++++++++++++++++++++++++++++++++++++++---------------------------------------


Mvariants/root-x86_64/ocaml-ppxlib | 74++++++++++++++++++++++++++++++++++++++------------------------------------


Mvariants/root-x86_64/ocaml-rresult | 72+++++++++++++++++++++++++++++++++++++-----------------------------------


Mvariants/root-x86_64/ocaml-sexplib0 | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/root-x86_64/ocaml-stdlib-shims | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/root-x86_64/ocaml-topkg | 70++++++++++++++++++++++++++++++++++++----------------------------------


Mvariants/root-x86_64/ocaml.environment | 18+++++++++---------


Mvariants/root-x86_64/ocaml:dynlink | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/root-x86_64/ocaml_intrinsics_kernel | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/root-x86_64/ocamlbuild | 72+++++++++++++++++++++++++++++++++++++-----------------------------------


Mvariants/root-x86_64/opam | 74++++++++++++++++++++++++++++++++++++++------------------------------------


Mvariants/root-x86_64/patch | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/root-x86_64/pkgconf | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/root-x86_64/pkgconf-pkg-config | 54+++++++++++++++++++++++++++---------------------------


Mvariants/root-x86_64/popt | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/root-x86_64/pthbs-banginstall | 58+++++++++++++++++++++++++++++-----------------------------


Mvariants/root-x86_64/rsync | 72+++++++++++++++++++++++++++++++++++++-----------------------------------


Mvariants/root-x86_64/s6 | 68+++++++++++++++++++++++++++++++++++---------------------------------


Mvariants/root-x86_64/s6-dns | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/root-x86_64/s6-linux-init | 70++++++++++++++++++++++++++++++++++++----------------------------------


Mvariants/root-x86_64/s6-linux-utils | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/root-x86_64/s6-networking | 74++++++++++++++++++++++++++++++++++++++------------------------------------


Mvariants/root-x86_64/s6-portable-utils | 66++++++++++++++++++++++++++++++++++--------------------------------


Mvariants/root-x86_64/s6-rc | 70++++++++++++++++++++++++++++++++++++----------------------------------


Mvariants/root-x86_64/skalibs | 62++++++++++++++++++++++++++++++++------------------------------


Mvariants/root-x86_64/snaprep | 60++++++++++++++++++++++++++++++------------------------------


Mvariants/root-x86_64/squashfs-tools | 68+++++++++++++++++++++++++++++++++++---------------------------------


Mvariants/root-x86_64/strace | 70++++++++++++++++++++++++++++++++++++----------------------------------


Mvariants/root-x86_64/system-config | 130++++++++++++++++++++++++++++++++++++++++----------------------------------------


Mvariants/root-x86_64/system-config-init | 108++++++++++++++++++++++++++++++++++++++++----------------------------------------


Mvariants/root-x86_64/system-config-rc | 66+++++++++++++++++++++++++++++++++---------------------------------


Mvariants/root-x86_64/system-config-scripts | 60++++++++++++++++++++++++++++++------------------------------


Mvariants/root-x86_64/system-config-zsh | 58+++++++++++++++++++++++++++++-----------------------------


Mvariants/root-x86_64/tinyssh | 64+++++++++++++++++++++++++++++++++-------------------------------


Mvariants/root-x86_64/user-env | 60++++++++++++++++++++++++++++++------------------------------


Mvariants/root-x86_64/userspace.environment | 182++++++++++++++++++++++++++++++++++++++++---------------------------------------


Mvariants/root-x86_64/vm.environment | 4++--


Mvariants/root-x86_64/xbps | 68+++++++++++++++++++++++++++++++++++---------------------------------


Mvariants/root-x86_64/zsh | 70++++++++++++++++++++++++++++++++++++----------------------------------


Mvariants/root-x86_64/zstd | 64+++++++++++++++++++++++++++++++++-------------------------------


358 files changed, 7817 insertions(+), 7420 deletions(-)

diff --git a/templates/autotools b/templates/autotools
@@ -1,9 +1,10 @@
+{%- import "package_sets" as ps -%}
 {% extends "genlinks" %}
 {%- do import_functions.add("autotools") %}
 {%- block template_deps -%}
 {{ super() -}}
 #+{{pkg_install_name("busybox-diffutils")}}
-#+{{pkg_install_name("musl-cross-make")}}
+{{ ps.toolchain() }}
 #+{{pkg_install_name("gnu-make")}}
 #+{{pkg_install_name("m4")}}
 {% endblock template_deps %}
diff --git a/templates/autotools_static_mini b/templates/autotools_static_mini
@@ -1,9 +1,10 @@
+{%- import "package_sets" as ps -%}
 {% extends "genlinks_mini" %}
 {%- do import_functions.update(["autotools", "build_env_static", "check_static"]) %}
 {%- block template_deps -%}
 {{ super() -}}
 #+{{pkg_install_name("busybox-diffutils")}}
-#+{{pkg_install_name("musl-cross-make")}}
+{{ ps.toolchain() }}
 #+{{pkg_install_name("gnu-make")}}
 #+{{pkg_install_name("m4")}}
 {% endblock template_deps %}
diff --git a/templates/dune b/templates/dune
@@ -1,8 +1,9 @@
+{%- import "package_sets" as ps -%}
 {% extends "genlinks" %}
 {% block template_deps -%}
 {{ super() -}}
 #+{{pkg_install_name("busybox-diffutils")}}
-#+{{pkg_install_name("musl-cross-make")}}
+{{ ps.toolchain() }}
 #+{{pkg_install_name("ocaml:dynlink")}}
 #+{{pkg_install_name("dune")}}
 {% endblock template_deps %}
diff --git a/templates/functions/check_dynamic b/templates/functions/check_dynamic
@@ -12,7 +12,7 @@ check_dynamic() {
 			printf '%s\n' "Error: '$1' is not a dynamic binary!"
 			exit 1
 			;;
-		(*'{{pkg_install_dir("musl-cross-make")}}/{{triplet}}/lib/ld-musl-{{triplet.split('-')[0]}}.so.1')
+		(*'{{pkg_install_dir("musl")}}/{{triplet}}/lib/ld-musl-{{triplet.split('-')[0]}}.so.1')
 			return 0
 			;;
 		(*)
diff --git a/templates/linux b/templates/linux
@@ -6,7 +6,7 @@
 {{ ps.busybox_common() }}
 #+{{pkg_install_name("busybox-modutils")}}
 #+{{pkg_install_name("gnu-make")}}
-#+{{pkg_install_name("musl-cross-make")}}
+{{ ps.toolchain() }}
 #+{{pkg_install_name("findutils")}}
 #+{{pkg_install_name("diffutils")}}
 #+{{pkg_install_name("patch")}}
diff --git a/templates/package_sets b/templates/package_sets
@@ -18,6 +18,12 @@
 #@sha256:75d5d255a2a273b6e651f82eecfabf6cbcd8eaeae70e86b417384c8f4a58d8d3:musl-cross-make/sources/config.sub
 {%- endmacro %}
 
+{% macro toolchain() -%}
+#+{{pkg_install_name("musl")}}
+#+{{pkg_install_name("gcc")}}
+#+{{pkg_install_name("binutils")}}
+{%- endmacro %}
+
 {% macro busybox_compress() -%}
 #+{{pkg_install_name("busybox-bzip2")}}
 #+{{pkg_install_name("busybox-gzip")}}
@@ -194,7 +200,7 @@
 {{ busybox_uncommon() }}
 #+{{pkg_install_name("attr")}}
 #+{{pkg_install_name("gnu-make")}}
-#+{{pkg_install_name("musl-cross-make")}}
+{{ toolchain() }}
 #+{{pkg_install_name("diffutils")}}
 #+{{pkg_install_name("patch")}}
 #+{{pkg_install_name("flex")}}
diff --git a/templates/pkg/abduco b/templates/pkg/abduco
@@ -1,8 +1,9 @@
+{%- import "package_sets" as ps -%}
 {%- set pkg_source="git" -%}
 {% extends "genlinks" %}
 {%- do import_functions.update(["build_env_static", "check_static"]) %}
 {% block package_deps -%}
-#+{{pkg_install_name("musl-cross-make")}}
+{{ ps.toolchain() }}
 #+{{pkg_install_name("gnu-make")}}
 #+{{pkg_install_name("busybox-diffutils")}}
 {% endblock %}
diff --git a/templates/pkg/apk-tools b/templates/pkg/apk-tools
@@ -1,8 +1,9 @@
+{%- import "package_sets" as ps -%}
 {%- set pkg_source="git" -%}
 {% extends "genlinks" %}
 {%- do import_functions.update(["build_env_static", "check_static"]) %}
 {%- block package_deps -%}
-#+{{pkg_install_name("musl-cross-make")}}
+{{ ps.toolchain() }}
 #+{{pkg_install_name("gnu-make")}}
 #+{{pkg_install_name("busybox-diffutils")}}
 #+{{pkg_install_name("patch")}}
diff --git a/templates/pkg/busybox b/templates/pkg/busybox
@@ -1,7 +1,8 @@
 {%- set pkg_source="git" -%}
+{%- import "package_sets" as ps -%}
 {% extends "generic" %}
 {%- block package_deps -%}
-#+{{pkg_install_name("musl-cross-make")}}
+{{ ps.toolchain() }}
 #+{{pkg_install_name("gnu-make:bootstrap")}}
 #+{{pkg_install_name("busybox:bootstrap")}}
 #@sha256:{{files["busybox.config"]}}:busybox/.config
diff --git a/templates/pkg/busybox:modutils b/templates/pkg/busybox:modutils
@@ -1,3 +1,4 @@
+{%- import "package_sets" as ps -%}
 {%- set pkg_source="git" -%}
 {% extends "generic" %}
 {% if kernel is undefined %}{% do skip("kernel variable is undefined") %}{% endif -%}
@@ -5,7 +6,7 @@
 {%- do import_functions.add("check_static") %}
 {% block package_deps -%}
 #+{{pkg_install_name(kernel)}}
-#+{{pkg_install_name("musl-cross-make")}}
+{{ ps.toolchain() }}
 #+{{pkg_install_name("gnu-make")}}
 {{ ps.busybox_common() }}
 #+{{pkg_install_name("busybox-findutils")}}
diff --git a/templates/pkg/ccx-utils b/templates/pkg/ccx-utils
@@ -1,8 +1,9 @@
+{%- import "package_sets" as ps -%}
 {%- set pkg_source="git" -%}
 {% extends "genlinks" %}
 {%- do import_functions.update(["build_env_static", "check_static"]) %}
 {% block package_deps -%}
-#+{{pkg_install_name("musl-cross-make")}}
+{{ ps.toolchain() }}
 #+{{pkg_install_name("gnu-make")}}
 #+{{pkg_install_name("skalibs")}}
 #+{{pkg_install_name("s6")}}
diff --git a/templates/pkg/dune b/templates/pkg/dune
@@ -1,9 +1,10 @@
+{%- import "package_sets" as ps -%}
 {%- set pkg_version="3.20.2" -%}
 {% extends "genlinks" %}
 {%- do import_functions.add("check_dynamic") %}
 {% block package_deps -%}
 #+{{pkg_install_name("busybox-diffutils")}}
-#+{{pkg_install_name("musl-cross-make")}}
+{{ ps.toolchain() }}
 #+{{pkg_install_name("ocaml:dynlink")}}
 #@untar:-z:sha256:579c738f8ca191ba0a9b22dbe78f1377542442c9827cf4939f8964f09f9edb28:.
 {% endblock package_deps %}
diff --git a/templates/pkg/error-standalone b/templates/pkg/error-standalone
@@ -1,9 +1,10 @@
+{%- import "package_sets" as ps -%}
 {%- set pkg_version="2.0" -%}
 {%- set pkg_source="tar.gz" -%}
 {% extends "genlinks" %}
 {%- do import_functions.add("build_env_static") %}
 {% block package_deps -%}
-#+{{pkg_install_name("musl-cross-make")}}
+{{ ps.toolchain() }}
 #+{{pkg_install_name("gnu-make")}}
 #+{{pkg_install_name("busybox-diffutils")}}
 {% endblock %}
diff --git a/templates/pkg/gcc b/templates/pkg/gcc
@@ -6,6 +6,11 @@
 #+{{pkg_install_name("musl-cross-make:bootstrap-1")}}
 #+{{pkg_install_name("gnu-make:bootstrap")}}
 #+{{pkg_install_name("busybox:bootstrap")}}
+#+{{pkg_install_name("musl")}}
+#+{{pkg_install_name("binutils")}}
+#+{{pkg_install_name("gmp")}}
+#+{{pkg_install_name("mpc")}}
+#+{{pkg_install_name("mpfr")}}
 #@sha256:{{files["mcm-"~shortname~"-"~pkg_version~"-merged.diff"]}}:merged.patch
 {% endblock package_deps %}
 {% block prepare %}
@@ -82,14 +87,13 @@ make \
 {%- endblock build %}
 {%- block install %}
 make \
-	MULTILIB_OSDIRNAMES= \
-	INFO_DEPS= \
-	infodir= \
-	ac_cv_prog_lex_root=lex.yy \
-	MAKEINFO=false \
-	AR="$mcm/bin/{{triplet}}-ar "\
-	RANLIB="$mcm/bin/{{triplet}}-ranlib" \
-	DESTDIR="$dest" \
+	'MULTILIB_OSDIRNAMES=' \
+	'INFO_DEPS=' \
+	'infodir=' \
+	'ac_cv_prog_lex_root=lex.yy' \
+	'MAKEINFO=false' \
+	'MAKE=make MULTILIB_OSDIRNAMES= INFO_DEPS= infodir= ac_cv_prog_lex_root=lex.yy MAKEINFO=false ' \
+	"DESTDIR=$dest" \
 	install
 
 {%- endblock install %}
diff --git a/templates/pkg/git b/templates/pkg/git
@@ -1,9 +1,10 @@
+{%- import "package_sets" as ps -%}
 {%- set pkg_version="2.43.2" -%}
 {%- set pkg_source="tar.xz" -%}
 {% extends "genlinks" %}
 {%- do import_functions.add("check_static") %}
 {% block package_deps -%}
-#+{{pkg_install_name("musl-cross-make")}}
+{{ ps.toolchain() }}
 #+{{pkg_install_name("gnu-make")}}
 #+{{pkg_install_name("busybox-diffutils")}}
 #+{{pkg_install_name("m4")}}
diff --git a/templates/pkg/gnu-make b/templates/pkg/gnu-make
@@ -1,9 +1,10 @@
+{%- import "package_sets" as ps -%}
 {%- set pkg_version="4.4.1" -%}
 {%- set src_dir="make-"+pkg_version -%}
 {% extends "autotools_static_mini" %}
 {%- block template_deps %}{% endblock %}
 {% block package_deps -%}
-#+{{pkg_install_name("musl-cross-make")}}
+{{ ps.toolchain() }}
 #+{{pkg_install_name("gnu-make:bootstrap")}}
 #+{{pkg_install_name("busybox:bootstrap")}}
 #@untar:-z:{{downloads["make-" + assertion(pkg_version) + ".tar.gz"]}}:.
diff --git a/templates/pkg/libcap b/templates/pkg/libcap
@@ -1,9 +1,10 @@
+{%- import "package_sets" as ps -%}
 {%- set pkg_version="2.69" -%}
 {%- set pkg_source="tar.xz" -%}
 {% extends "genlinks" %}
 {%- do import_functions.update(["build_env_static", "check_static"]) %}
 {% block package_deps -%}
-#+{{pkg_install_name("musl-cross-make")}}
+{{ ps.toolchain() }}
 #+{{pkg_install_name("gnu-make")}}
 #+{{pkg_install_name("busybox-diffutils")}}
 #+{{pkg_install_name("pkgconf-pkg-config")}}
diff --git a/templates/pkg/libelf b/templates/pkg/libelf
@@ -1,8 +1,9 @@
+{%- import "package_sets" as ps -%}
 {%- set pkg_source="git" -%}
 {% extends "genlinks" %}
 {%- do import_functions.add("build_env_static") %}
 {% block package_deps -%}
-#+{{pkg_install_name("musl-cross-make")}}
+{{ ps.toolchain() }}
 #+{{pkg_install_name("gnu-make")}}
 #+{{pkg_install_name("busybox-diffutils")}}
 #+{{pkg_install_name("zstd")}}
diff --git a/templates/pkg/logincaps b/templates/pkg/logincaps
@@ -1,9 +1,10 @@
+{%- import "package_sets" as ps -%}
 {%- set pkg_source="git" -%}
 {% extends "scriptsetup" %}
 {%- do import_functions.add("check_static") %}
 {% block package_deps -%}
 #+{{pkg_install_name("execline")}}
-#+{{pkg_install_name("musl-cross-make")}}
+{{ ps.toolchain() }}
 #+{{pkg_install_name("ccx-utils")}}
 {% endblock %}
 {% block install -%}
diff --git a/templates/pkg/m4 b/templates/pkg/m4
@@ -1,10 +1,11 @@
+{%- import "package_sets" as ps -%}
 {%- set pkg_version="1.4.19" -%}
 {%- set pkg_source="tar.gz" -%}
 {% extends "autotools_static_mini" %}
 {%- block template_deps %}{% endblock %}
 {% block package_deps -%}
 {%- import "package_sets" as ps -%}
-#+{{pkg_install_name("musl-cross-make")}}
+{{ ps.toolchain() }}
 #+{{pkg_install_name("gnu-make")}}
 {{ ps.busybox_common() }}
 #+{{pkg_install_name("busybox-findutils")}}
diff --git a/templates/pkg/mandoc b/templates/pkg/mandoc
@@ -1,9 +1,10 @@
+{%- import "package_sets" as ps -%}
 {%- set pkg_version="1.14.6" -%}
 {%- set pkg_source="tar.gz" -%}
 {% extends "genlinks" %}
 {%- do import_functions.update(["check_static"]) %}
 {%- block package_deps -%}
-#+{{pkg_install_name("musl-cross-make")}}
+{{ ps.toolchain() }}
 #+{{pkg_install_name("gnu-make")}}
 #+{{pkg_install_name("busybox-diffutils")}}
 {% endblock package_deps %}
diff --git a/templates/pkg/mlog b/templates/pkg/mlog
@@ -1,8 +1,9 @@
+{%- import "package_sets" as ps -%}
 {%- set pkg_source="git" -%}
 {% extends "genlinks" %}
 {%- do import_functions.update(["build_env_static", "check_static"]) %}
 {% block package_deps -%}
-#+{{pkg_install_name("musl-cross-make")}}
+{{ ps.toolchain() }}
 #+{{pkg_install_name("gnu-make")}}
 {% endblock %}
 {% block build -%}
diff --git a/templates/pkg/musl-fts b/templates/pkg/musl-fts
@@ -1,9 +1,10 @@
+{%- import "package_sets" as ps -%}
 {%- set pkg_version="1.2.7" -%}
 {% extends "genlinks" %}
 {%- do import_functions.add("build_env_static") %}
 {% block package_deps -%}
 #+{{pkg_install_name("busybox-diffutils")}}
-#+{{pkg_install_name("musl-cross-make")}}
+{{ ps.toolchain() }}
 #@untar:-z:sha256:49ae567a96dbab22823d045ffebe0d6b14b9b799925e9ca9274d47d26ff482a6:.
 {% endblock %}
 {% block build -%}
diff --git a/templates/pkg/nawk b/templates/pkg/nawk
@@ -1,10 +1,11 @@
+{%- import "package_sets" as ps -%}
 {%- set pkg_version="20250116" -%}
 {%- set src_dir="awk-20250116" -%}
 {% extends "genlinks" %}
 {%- block package_deps -%}
 {{ super() -}}
 #+{{pkg_install_name("bison")}}
-#+{{pkg_install_name("musl-cross-make")}}
+{{ ps.toolchain() }}
 #+{{pkg_install_name("gnu-make")}}
 #@untar:-z:sha256:e031b1e1d2b230f276f975bffb923f0ea15f798c839d15a3f26a1a39448e32d7:.
 {% endblock %}
diff --git a/templates/pkg/netbsd-curses b/templates/pkg/netbsd-curses
@@ -1,8 +1,9 @@
+{%- import "package_sets" as ps -%}
 {%- set pkg_source="git" -%}
 {% extends "genlinks" %}
 {% block package_deps -%}
 #+{{pkg_install_name("gnu-make")}}
-#+{{pkg_install_name("musl-cross-make")}}
+{{ ps.toolchain() }}
 {% endblock %}
 {% block configure -%}
 export CFLAGS="-L$pthbs_build_environment/{{libdir}} -L$pthbs_build_environment/{{dynlibdir}}"
diff --git a/templates/pkg/ocaml-findlib b/templates/pkg/ocaml-findlib
@@ -1,10 +1,11 @@
+{%- import "package_sets" as ps -%}
 {%- set pkg_version="1.9.8" -%}
 {%- set src_dir="findlib-"+pkg_version -%}
 {% extends "genlinks" %}
 {%- do import_functions.add("check_dynamic") %}
 {% block package_deps -%}
 #+{{pkg_install_name("busybox-diffutils")}}
-#+{{pkg_install_name("musl-cross-make")}}
+{{ ps.toolchain() }}
 #+{{pkg_install_name("gnu-make")}}
 #+{{pkg_install_name("m4")}}
 #+{{pkg_install_name("netbsd-curses")}}
diff --git a/templates/pkg/ocaml_intrinsics_kernel b/templates/pkg/ocaml_intrinsics_kernel
@@ -1,9 +1,10 @@
+{%- import "package_sets" as ps -%}
 {%- set pkg_version="0.17.1" -%}
 {%- set pkg_format="tar.gz" -%}
 {% extends "genlinks" %}
 {% block package_deps -%}
 #+{{pkg_install_name("busybox-diffutils")}}
-#+{{pkg_install_name("musl-cross-make")}}
+{{ ps.toolchain() }}
 #+{{pkg_install_name("ocaml:dynlink")}}
 #+{{pkg_install_name("dune")}}
 #@untar:-z:sha256:c988b7769a59749631c3c98ba5edd1d2fe91f5dc380b5e0593c073c92f4bee01:.
diff --git a/templates/pkg/ocamlbuild b/templates/pkg/ocamlbuild
@@ -1,9 +1,10 @@
+{%- import "package_sets" as ps -%}
 {%- set pkg_version="0.16.1" -%}
 {% extends "genlinks" %}
 {%- do import_functions.add("check_dynamic") %}
 {% block package_deps -%}
 #+{{pkg_install_name("busybox-diffutils")}}
-#+{{pkg_install_name("musl-cross-make")}}
+{{ ps.toolchain() }}
 #+{{pkg_install_name("gnu-make")}}
 #+{{pkg_install_name("m4")}}
 #+{{pkg_install_name("ocaml:dynlink")}}
diff --git a/templates/pkg/opam b/templates/pkg/opam
@@ -1,3 +1,4 @@
+{%- import "package_sets" as ps -%}
 {%- set pkg_version="2.4.1" -%}
 {%- set src_dir="opam-full-"+pkg_version -%}
 {% extends "genlinks" %}
@@ -6,7 +7,7 @@
 #+{{pkg_install_name("diffutils")}}
 #+{{pkg_install_name("patch")}}
 #+{{pkg_install_name("gnu-make")}}
-#+{{pkg_install_name("musl-cross-make")}}
+{{ ps.toolchain() }}
 #+{{pkg_install_name("getconf")}}
 #+{{pkg_install_name("ocaml:dynlink")}}
 #+{{pkg_install_name("dune")}}
diff --git a/templates/pkg/openssl b/templates/pkg/openssl
@@ -1,3 +1,4 @@
+{%- import "package_sets" as ps -%}
 {%- set pkg_version="3.3.3" -%}
 {% do skip("stub") %}
 {%- set pkg_source="tar.gz" -%}
@@ -5,7 +6,7 @@
 {%- do import_functions.update(["build_env_static", "check_static"]) %}
 {% block package_deps -%}
 #+{{pkg_install_name("gnu-make")}}
-#+{{pkg_install_name("musl-cross-make")}}
+{{ ps.toolchain() }}
 {% endblock %}
 {% block configure -%}
 build_env_static
diff --git a/templates/pkg/rsync b/templates/pkg/rsync
@@ -1,3 +1,4 @@
+{%- import "package_sets" as ps -%}
 {%- set pkg_version="3.2.7" -%}
 {%- set pkg_source="tar.gz" -%}
 {% extends "autotools_static_mini" %}
@@ -6,7 +7,7 @@
 {{ ps.busybox_common() }}
 #+{{pkg_install_name("busybox-findutils")}}
 #+{{pkg_install_name("busybox-diffutils")}}
-#+{{pkg_install_name("musl-cross-make")}}
+{{ ps.toolchain() }}
 #+{{pkg_install_name("gnu-make")}}
 #+{{pkg_install_name("m4")}}
 #+{{pkg_install_name("nawk")}}
diff --git a/templates/pkg/skalibs b/templates/pkg/skalibs
@@ -1,7 +1,8 @@
+{%- import "package_sets" as ps -%}
 {%- set pkg_source="git" -%}
 {% extends "genlinks" %}
 {% block package_deps -%}
-#+{{pkg_install_name("musl-cross-make")}}
+{{ ps.toolchain() }}
 #+{{pkg_install_name("gnu-make")}}
 {% endblock %}
 {% block configure -%}
diff --git a/templates/pkg/squashfs-tools b/templates/pkg/squashfs-tools
@@ -1,9 +1,10 @@
+{%- import "package_sets" as ps -%}
 {%- set pkg_version="4.7.2" -%}
 {% extends "genlinks" %}
 {%- do import_functions.update(["check_static", "build_env_static"]) %}
 {%- block package_deps -%}
 #+{{pkg_install_name("busybox-diffutils")}}
-#+{{pkg_install_name("musl-cross-make")}}
+{{ ps.toolchain() }}
 #+{{pkg_install_name("gnu-make")}}
 #+{{pkg_install_name("attr")}}
 #+{{pkg_install_name("zstd")}}
diff --git a/templates/pkg/tinyssh b/templates/pkg/tinyssh
@@ -1,8 +1,9 @@
+{%- import "package_sets" as ps -%}
 {%- set pkg_version="20250501" -%}
 {% extends "genlinks" %}
 {%- do import_functions.update(["build_env_static", "check_static"]) %}
 {%- block package_deps -%}
-#+{{pkg_install_name("musl-cross-make")}}
+{{ ps.toolchain() }}
 #+{{pkg_install_name("gnu-make")}}
 #+{{pkg_install_name("busybox-diffutils")}}
 #@untar:-z:{{downloads["https://github.com/janmojzis/tinyssh/archive/refs/tags/"~pkg_version~".tar.gz"]}}:.
diff --git a/templates/pkg/xbps b/templates/pkg/xbps
@@ -1,8 +1,9 @@
+{%- import "package_sets" as ps -%}
 {%- set pkg_version="0.59.2" -%}
 {% extends "genlinks" %}
 {%- do import_functions.update(["build_env_static", "check_static"]) %}
 {% block package_deps -%}
-#+{{pkg_install_name("musl-cross-make")}}
+{{ ps.toolchain() }}
 #+{{pkg_install_name("gnu-make")}}
 #+{{pkg_install_name("libarchive")}}
 #+{{pkg_install_name("libressl")}}
diff --git a/templates/pkg/zstd b/templates/pkg/zstd
@@ -1,8 +1,9 @@
+{%- import "package_sets" as ps -%}
 {%- set pkg_version="1.5.5" -%}
 {% extends "genlinks" %}
 {%- do import_functions.update(["build_env_static", "check_static"]) %}
 {% block package_deps -%}
-#+{{pkg_install_name("musl-cross-make")}}
+{{ ps.toolchain() }}
 #+{{pkg_install_name("gnu-make")}}
 #+{{pkg_install_name("busybox-diffutils")}}
 #@untar:-z:sha256:98e9c3d949d1b924e28e01eccb7deed865eefebf25c2f21c702e5cd5b63b85e1:.
diff --git a/templates/single_static_c b/templates/single_static_c
@@ -1,8 +1,9 @@
+{%- import "package_sets" as ps -%}
 {% extends "genlinks" %}
 {%- do import_functions.update(["build_env_static", "check_static"]) %}
 {%- block template_deps -%}
 {{ super() -}}
-#+{{pkg_install_name("musl-cross-make")}}
+{{ ps.toolchain() }}
 {% endblock %}
 {%- block source_deps -%}
 #@sha256:{{ files[shortname + ".c"] }}:{{ shortname }}.c
diff --git a/templates/skaware b/templates/skaware
@@ -1,7 +1,8 @@
+{%- import "package_sets" as ps -%}
 {% extends "genlinks" %}
 {%- block template_deps -%}
 {{ super() -}}
-#+{{pkg_install_name("musl-cross-make")}}
+{{ ps.toolchain() }}
 #+{{pkg_install_name("gnu-make")}}
 #+{{pkg_install_name("skalibs")}}
 {% endblock %}
diff --git a/templates/topkg b/templates/topkg
@@ -1,9 +1,10 @@
+{%- import "package_sets" as ps -%}
 {% extends "genlinks" %}
 {% import "macros" as m %}
 {% block template_deps -%}
 {{ super() -}}
 #+{{pkg_install_name("busybox-diffutils")}}
-#+{{pkg_install_name("musl-cross-make")}}
+{{ ps.toolchain() }}
 #+{{pkg_install_name("ocaml:dynlink")}}
 #+{{pkg_install_name("ocaml-findlib")}}
 #+{{pkg_install_name("ocamlbuild")}}
diff --git a/variants/ccx-x86_64/aat b/variants/ccx-x86_64/aat
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+zsh.b2e3d0846aaa9fbaff883701998485f288f4cebfdcedabc88d3140162c6bc6b3
-#+pthbs-banginstall.a459b0c5dfd826f3cdbf00e997067dffc3d4f7ec54ff46e47567b1f2b276805d
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+zsh.fcffbffcb0c0c3352f1cbfa0cc46559dfa56aa4095d5877892aa4b0e021fdc74
+#+pthbs-banginstall.576ac5077b84a6b4fe98be3f49056422e94f7f547287656cd09e8fce9ce3bd7d
 #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat
 
 
diff --git a/variants/ccx-x86_64/abduco b/variants/ccx-x86_64/abduco
@@ -1,35 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
 #@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.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
 #@git:c7b36ed27103ee3f9aa01905ba1fac2d606079cf:alpine-keys
 
 
diff --git a/variants/ccx-x86_64/apk-tools b/variants/ccx-x86_64/apk-tools
@@ -1,39 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+patch.141394d3463b9153bdd6b421d8f10b79dd1c458eafb2244bd9af5d7638e67a08
-#+libressl.0e2a2d650925ed59678ae580bd35afecdf5b3b5704b1d86d990ad3ff223dcb84
-#+zstd.c1107c320609d03324f44b811645887857b5858b8b443e1892459697d08d6f6c
-#+pkgconf-pkg-config.8f6b75c4c3fab946cd53a5ea0154ed8133db1909133a64e0c9696cb120af6bc7
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+patch.6a227048016d19b54309e21e725a704d23707bb366d384df4cd30eaccaae3f55
+#+libressl.149d83ff736e1ca773a90e36086cd74e89942d184091ed5ac7a6470bcf6c3ef5
+#+zstd.1bfd81018a42b01b2b301cfc74c160e4137f03a31a0adeaa86a6569cc95b1717
+#+pkgconf-pkg-config.9aa3902fbb930df881f7e5402b8c784ef1672caccff791830d913246ee8fd5c9
 #@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,35 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+skalibs.4c6bb8bcee00bd264a1cf26c17e36d7155f840f53128be18cdd5d1f00db157eb
-#+libcap.3d1d91f4a1728a27046d5ef5c0b4eefc60cfe82824ce1272b7e0a7c6b9e78808
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+skalibs.04e057b8769ebec90f4eaa3993bed48a602f6bdf88a558bf173827bbbbd44392
+#+libcap.da38f24016be4eff73b3862da403658da0107cc476b4c5c269569b38c7e133a0
 #@sha256:818a5ad7061ab1a740a5c2e7d7d8cdcc7be7e84e3f04b479731cf94ff1f1d093:applyuidgid-caps.c
 
 
diff --git a/variants/ccx-x86_64/argp-standalone b/variants/ccx-x86_64/argp-standalone
@@ -1,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+m4.6f7bd3298835d0609008d0fbdb57c9ba9867d8710ad92c1fbdc644f1f6e0ac73
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+m4.30d10cc3eee1114a0e9c629a357a10cc0b9acc4d5eff1c594d6ed9a1db30462f
 #@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,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+m4.6f7bd3298835d0609008d0fbdb57c9ba9867d8710ad92c1fbdc644f1f6e0ac73
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+m4.30d10cc3eee1114a0e9c629a357a10cc0b9acc4d5eff1c594d6ed9a1db30462f
 #@untar:-z:sha256:39bf67452fa41d0948c2197601053f48b3d78a029389734332a6309a680c6c87:.
 
 
diff --git a/variants/ccx-x86_64/bison b/variants/ccx-x86_64/bison
@@ -1,37 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+m4.6f7bd3298835d0609008d0fbdb57c9ba9867d8710ad92c1fbdc644f1f6e0ac73
-#+flex.7dec2a01c6efef521a5a6c4ebc6b04c2375a2b25812bf4cdbff26899deabc771
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+m4.30d10cc3eee1114a0e9c629a357a10cc0b9acc4d5eff1c594d6ed9a1db30462f
+#+flex.0f73e9b8fa28dc3baf349d08527e0d33926692a897f6efe26519a4c9d901aad4
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
 
diff --git a/variants/ccx-x86_64/busybox b/variants/ccx-x86_64/busybox
@@ -1,5 +1,7 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
 #+gnu-make.f2ed650e0fc6741ae940145d114a932779251b577642c9c7b42f5d3fc1b8a7cb
 #+busybox.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
 #@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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
 
 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,35 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+linux-qemu-guest.55844d58fdfeaeff910a4223faa23e9bb02bccd67b44af310d6ebf2fa381c2e3
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
+#+linux-qemu-guest.4c311dd129df592d1c7db541bac5a9e7f12bb45479daa914799d93a486dc4e3c
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
 #@sha256:ccb459010923e1a9b49cb39d45bc93d0fc8749acea6efd7b19cfb00e76a5562e:busybox/.config
 #@git:3621595939e43a831d66f6b757d4f410029bff95:busybox
 
@@ -60,7 +62,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.55844d58fdfeaeff910a4223faa23e9bb02bccd67b44af310d6ebf2fa381c2e3"
+CONFIG_DEFAULT_MODULES_DIR="/home/ccx/versions/linux-qemu-guest.4c311dd129df592d1c7db541bac5a9e7f12bb45479daa914799d93a486dc4e3c"
 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.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+certdata2pem.bd2a12a490c1632c12f20b47a8b5d98f9480c1b6a84ab41d95f68e780b6c8b53
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+certdata2pem.7c51881091feced45ad755cff4c6b2c2f51a88d928adb59173ca857ae4e41091
 #@untar:-j:sha256:6ef7bc56cc0e0b307d99a3c494119686091cc1d4ad08986d68aa089dd00c7788:.
 
 
diff --git a/variants/ccx-x86_64/ccx-utils b/variants/ccx-x86_64/ccx-utils
@@ -1,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+skalibs.4c6bb8bcee00bd264a1cf26c17e36d7155f840f53128be18cdd5d1f00db157eb
-#+s6.8c7ff734f64e9c89d65907441f5ca6058d8e7eb56d19f44ec7bd9c1e1c9db4d9
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+skalibs.04e057b8769ebec90f4eaa3993bed48a602f6bdf88a558bf173827bbbbd44392
+#+s6.072c6be2de59334ae0f8fe3b95baa3fce42bf15b25d8d4c2162b68f794a1f19b
 #@git:461a9ec198c1e2b9c39a34e21786747dbb8671b4:ccx-utils
 
 
diff --git a/variants/ccx-x86_64/certdata2pem b/variants/ccx-x86_64/certdata2pem
@@ -1,33 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
 #@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.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+zsh.b2e3d0846aaa9fbaff883701998485f288f4cebfdcedabc88d3140162c6bc6b3
-#+pthbs-banginstall.a459b0c5dfd826f3cdbf00e997067dffc3d4f7ec54ff46e47567b1f2b276805d
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+zsh.fcffbffcb0c0c3352f1cbfa0cc46559dfa56aa4095d5877892aa4b0e021fdc74
+#+pthbs-banginstall.576ac5077b84a6b4fe98be3f49056422e94f7f547287656cd09e8fce9ce3bd7d
 #@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.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-dosfstools.983566a17821fcb32de0dddb7d6e785978c7273a96fc2351328089f9b600a4b9
-#+busybox-e2fsprogs.8f553a043e9d98e5e9d7268a166f7384a119d4819491a8839add7fc8ddb11892
-#+busybox-iproute2.81e4a1c96593d1bd624ee0bb11a204e0534c0b1cdc2c2e264a798f7569c52aca
-#+busybox-iputils.446fea1101fdfdf8b1b5af0ad5a4b2d2aa29adcaad812657ae48591fd224a396
-#+busybox-net-misc.ca6a84e212d8f555a0eac8637c83af010eca98db095db6f59171d35f91bc6935
-#+busybox-net-tools.f75ed05accc163299209dd375747e79e74e2d339373e6a80e6fe9373019cd6cb
-#+busybox-traceroute.1b0be7e3408d7589fa42d9e8f6a35cbb731297ed1c31e85ab87c9455d6b41068
-#+busybox-wget.b1eabcbee77e23b2340e1d3728d08f2565d5ec2a85ad485524f640b0cf69607e
-#+busybox-chpst.4b8ecfc8e205aee07b69f3e84d25b36637f765f53104f264f6f1c6fddda421e7
-#+busybox-console.8c83a1e67dcbd4ed580eadbbede4b0fec4f39ba77eb7a88f3c7113fca3b1a4f2
-#+busybox-getty.fc722cd28dddbc98d4991e91f764175fbe14d0636cf7e9e7d2f6149686ecb97e
-#+busybox-i2c-tools.48da2f9070109fcd7b1c6b437e5594c7331833411a67d74bece7751d8caba5e4
-#+busybox-linux-extra.8fec0ca34fa9ccc3eb472504473966830b1fa2c3c312a43f1d85867cea375fbc
-#+busybox-mtd-utils.1b7a0851def92f071f7230dc1e5b43d5b1cf7dc93de43d5392eaf97618fb90b9
-#+busybox-shadow.e05e541ad31c2afda4d355ab59727b2cf277e7047cfe312689a3d56bf3e2f593
-#+busybox-su.3151f0c0e0d3703fd8da9933b3fbe21bb51a78140d8caaa990e375f61c95d60e
-#+busybox-util-linux-priv.b38cb2fdda0edc168b3174cf7fc77eb101dcf56b6455d886fc931571120317ae
-#+busybox-logging.8282676a88f6e0bfc4a85146e7130c07749d58a5e9cc66d5e45ca8aa955f725f
-#+busybox-cron.dcf107e80707f311473e574da4dae533dc5944aa528156e7dfeedde136fad677
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-login.44961532a7561db573d32fd741e9d3594e9da83cf9e912fbbe5a520cb84fd84f
-#+execline.98b288bf884e98dfd1774d38c3ce0cd767b1c122ae8582ce137ee9f7d325e67b
-#+s6.8c7ff734f64e9c89d65907441f5ca6058d8e7eb56d19f44ec7bd9c1e1c9db4d9
-#+ccx-utils.ce34c3f8769025b772d7d1e8bb0ba77b525f890a862e2e050757593e3bbb2399
-#+applyuidgid-caps.313a50f6417964d873219b51d963215764840372ba5dc304473976a088c97fc4
-#+easyseccomp.10d4f543ffc322077224e1a078550353f6b8e630d5e5e933493b526e22b91c54
-#+mlog.4dc4985f2bf9e890262e110ab9a9cbe4e71c02ea6cdd507a72b565a0b6fd48a4
-#+abduco.4b3569882a25506d2b7d3e29950946466b6270f1fc59ce4fff474d4d2c90b7b9
-#+nawk.3d4adac0ba89766e0cafa44e623d55d4318d90e397bf76e0cf69011d7c059f07
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-dosfstools.bd9f2a329ddc9500a0b1d41767f0f4c80465d5d9af7f5d373666a51d35ae48ec
+#+busybox-e2fsprogs.2c541e5e1c8b7d2c147f6160d3ab92d89292a22b40fcf012c2ff1e709be394f4
+#+busybox-iproute2.a62d2e42193917f401c9a64e9fbbc97fc91e4a6064e886afa4210064cf1848d3
+#+busybox-iputils.71b6dbfef6b576a24160e102004c80aaf7837038bf42457b40215d38b80c9a5c
+#+busybox-net-misc.8f7dba414abce07473c2a3821086eb5147a2099a921d2365a81a3c16fa975fc2
+#+busybox-net-tools.cd08a41275209fb450e1a51c5d2c7de1abcdfe263190d0479e23d396fd0a61eb
+#+busybox-traceroute.c400683e9bf8d40f2d3b5236cac481e192fa0eaa6ab5dfabfbfffd365e8b8b50
+#+busybox-wget.79b50d20c9545dd941e0434bd64504d8369d24a4300304eeeb05ba3018affd5b
+#+busybox-chpst.955df8c837a844e1f1ffa117dedad7f202b85b3249be89901ccbcf28c5c7b805
+#+busybox-console.738d93ed50aee55c7f727fe85af0dbfad5897923e1c4ae0212538482d02009e6
+#+busybox-getty.86d09199ca03e869469ddca340377204d852bb2c1ea1b1712bf4276ce915641d
+#+busybox-i2c-tools.ba8892e9b938d0f9f26d6abf912400dd699bd9dd9ea5117be1c982d081f4b854
+#+busybox-linux-extra.ba3ab388d30aae158923323d139d36824359ef91e245dcd3c3d51d9dba00dae6
+#+busybox-mtd-utils.d4cfd607db2e0da3c1b9914aa67600440dc1dbdf57ed31a8f3ca95824d2607c7
+#+busybox-shadow.8ace403350ee33fa804385f4ae1c957ec0f4b26a031e23d74493a8bd96191e33
+#+busybox-su.b7030f31914b1f2d4e1c6d1f94ec207a51064374faffdd73962e64b955457983
+#+busybox-util-linux-priv.39d056aa0e75b5d17fb08a4b79898a4a8a9d3dbc05e4da8d98a963db36ba87ec
+#+busybox-logging.0f3cb2c5ebf2debb281e35c86d902094af5ba3be298cb32ae940fc0c53388d15
+#+busybox-cron.e7d9db51b1fbbd3961867e5c1eb18318223a7935da074f833636f3acb2db180f
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-login.6347ff1bea8eac97d4314d56c0753f696f1aed4770c606de4c655dd52421204a
+#+execline.2d9890704cb30e173554301ee68511361318af7395d96396d35c302e5dff922e
+#+s6.072c6be2de59334ae0f8fe3b95baa3fce42bf15b25d8d4c2162b68f794a1f19b
+#+ccx-utils.c67eb9f7f7362065137149d680038c399d65e4c0f0f71a33e6325d9deb632d60
+#+applyuidgid-caps.3b7dff1fcc8c671e9c560bdd26bddb6d79b8f1627b621f389d4c406499f8f774
+#+easyseccomp.7a20108daf3b7a6044b78e72427ed6af02004b0b74baf85be4ff0cee4c2a3899
+#+mlog.893b660f52f7c23261f952767c8d77be1549026c56e6eb607a49b069b264395a
+#+abduco.f4a36ce770e603915d8899b6ef111b203d75b4c0431df65df2385c1188427191
+#+nawk.257a482c0dc30655341c73bf73ba2548fd6c9a85b1be5fddc14b0504a0534e86
 #@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.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+zsh.b2e3d0846aaa9fbaff883701998485f288f4cebfdcedabc88d3140162c6bc6b3
-#+pthbs-banginstall.a459b0c5dfd826f3cdbf00e997067dffc3d4f7ec54ff46e47567b1f2b276805d
-#+execline.98b288bf884e98dfd1774d38c3ce0cd767b1c122ae8582ce137ee9f7d325e67b
-#+alpine-keys.18727edd0ccf78240524c73dab1934ed2af6b447906232335dd8cc788e6cd2bb
-#+apk-tools.1c16fab9d946f7bbdecf734700681d37a013ab60a45c9624270345004a20eefd
-#+xbps.2a97d80dfbff70cdd481a5f611f189dec25604feb2a036d846e4694f0104717f
-#+container-bin-image.aacedd386bb6fa801273364b8a6dddcce1e801ac7d88e0dac09f6c9e250dac5d
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+zsh.fcffbffcb0c0c3352f1cbfa0cc46559dfa56aa4095d5877892aa4b0e021fdc74
+#+pthbs-banginstall.576ac5077b84a6b4fe98be3f49056422e94f7f547287656cd09e8fce9ce3bd7d
+#+execline.2d9890704cb30e173554301ee68511361318af7395d96396d35c302e5dff922e
+#+alpine-keys.2a8d3c2cf05da31b5f0eeb106ccd5f86adb5067ff808f5359139c8da2fa55d06
+#+apk-tools.8c72a3f01914e3e9f5da89cd3e9ca1f863b90e45d35057e42a52a6fc0dc12094
+#+xbps.8865f2eff3e57ef75a2ca02a50e2be7c02e7d0a5e53aa1e7dfd825c4e849ac0e
+#+container-bin-image.1502883baefb0452423f47db6448aa23fd7ff8c735242ca56fe2bfe40af8d0dc
 #@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.1c16fab9d946f7bbdecf734700681d37a013ab60a45c9624270345004a20eefd/command/apk.static' "${dest}/deps/command/"
-ln -sf '/home/ccx/versions/xbps.2a97d80dfbff70cdd481a5f611f189dec25604feb2a036d846e4694f0104717f/command/xbps-install.static' "${dest}/deps/command/"
+ln -sf '/home/ccx/versions/apk-tools.8c72a3f01914e3e9f5da89cd3e9ca1f863b90e45d35057e42a52a6fc0dc12094/command/apk.static' "${dest}/deps/command/"
+ln -sf '/home/ccx/versions/xbps.8865f2eff3e57ef75a2ca02a50e2be7c02e7d0a5e53aa1e7dfd825c4e849ac0e/command/xbps-install.static' "${dest}/deps/command/"
 
-for f in '/home/ccx/versions/alpine-keys.18727edd0ccf78240524c73dab1934ed2af6b447906232335dd8cc788e6cd2bb'/keys/alpine/*/*; do
+for f in '/home/ccx/versions/alpine-keys.2a8d3c2cf05da31b5f0eeb106ccd5f86adb5067ff808f5359139c8da2fa55d06'/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.18727edd0ccf78240524c73dab1934ed2af6b44
 done
  
 mkdir -p "${dest}/deps/keys/void"
-for f in '/home/ccx/versions/xbps.2a97d80dfbff70cdd481a5f611f189dec25604feb2a036d846e4694f0104717f'/keys/void/*; do
+for f in '/home/ccx/versions/xbps.8865f2eff3e57ef75a2ca02a50e2be7c02e7d0a5e53aa1e7dfd825c4e849ac0e'/keys/void/*; do
 	ln -sf "$f" "${dest}/deps/keys/void/"
 done
 
-test -d '/home/ccx/versions/container-bin-image.aacedd386bb6fa801273364b8a6dddcce1e801ac7d88e0dac09f6c9e250dac5d/container-bin-image'
-test -f '/home/ccx/versions/container-bin-image.aacedd386bb6fa801273364b8a6dddcce1e801ac7d88e0dac09f6c9e250dac5d/container-bin-image/if'
-ln -sf '/home/ccx/versions/container-bin-image.aacedd386bb6fa801273364b8a6dddcce1e801ac7d88e0dac09f6c9e250dac5d/container-bin-image' "${dest}/deps/"
+test -d '/home/ccx/versions/container-bin-image.1502883baefb0452423f47db6448aa23fd7ff8c735242ca56fe2bfe40af8d0dc/container-bin-image'
+test -f '/home/ccx/versions/container-bin-image.1502883baefb0452423f47db6448aa23fd7ff8c735242ca56fe2bfe40af8d0dc/container-bin-image/if'
+ln -sf '/home/ccx/versions/container-bin-image.1502883baefb0452423f47db6448aa23fd7ff8c735242ca56fe2bfe40af8d0dc/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.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-dosfstools.983566a17821fcb32de0dddb7d6e785978c7273a96fc2351328089f9b600a4b9
-#+busybox-e2fsprogs.8f553a043e9d98e5e9d7268a166f7384a119d4819491a8839add7fc8ddb11892
-#+busybox-iproute2.81e4a1c96593d1bd624ee0bb11a204e0534c0b1cdc2c2e264a798f7569c52aca
-#+busybox-iputils.446fea1101fdfdf8b1b5af0ad5a4b2d2aa29adcaad812657ae48591fd224a396
-#+busybox-net-misc.ca6a84e212d8f555a0eac8637c83af010eca98db095db6f59171d35f91bc6935
-#+busybox-net-tools.f75ed05accc163299209dd375747e79e74e2d339373e6a80e6fe9373019cd6cb
-#+busybox-traceroute.1b0be7e3408d7589fa42d9e8f6a35cbb731297ed1c31e85ab87c9455d6b41068
-#+busybox-wget.b1eabcbee77e23b2340e1d3728d08f2565d5ec2a85ad485524f640b0cf69607e
-#+busybox-chpst.4b8ecfc8e205aee07b69f3e84d25b36637f765f53104f264f6f1c6fddda421e7
-#+busybox-console.8c83a1e67dcbd4ed580eadbbede4b0fec4f39ba77eb7a88f3c7113fca3b1a4f2
-#+busybox-getty.fc722cd28dddbc98d4991e91f764175fbe14d0636cf7e9e7d2f6149686ecb97e
-#+busybox-i2c-tools.48da2f9070109fcd7b1c6b437e5594c7331833411a67d74bece7751d8caba5e4
-#+busybox-linux-extra.8fec0ca34fa9ccc3eb472504473966830b1fa2c3c312a43f1d85867cea375fbc
-#+busybox-mtd-utils.1b7a0851def92f071f7230dc1e5b43d5b1cf7dc93de43d5392eaf97618fb90b9
-#+busybox-shadow.e05e541ad31c2afda4d355ab59727b2cf277e7047cfe312689a3d56bf3e2f593
-#+busybox-su.3151f0c0e0d3703fd8da9933b3fbe21bb51a78140d8caaa990e375f61c95d60e
-#+busybox-util-linux-priv.b38cb2fdda0edc168b3174cf7fc77eb101dcf56b6455d886fc931571120317ae
-#+busybox-logging.8282676a88f6e0bfc4a85146e7130c07749d58a5e9cc66d5e45ca8aa955f725f
-#+busybox-cron.dcf107e80707f311473e574da4dae533dc5944aa528156e7dfeedde136fad677
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+execline.98b288bf884e98dfd1774d38c3ce0cd767b1c122ae8582ce137ee9f7d325e67b
-#+s6.8c7ff734f64e9c89d65907441f5ca6058d8e7eb56d19f44ec7bd9c1e1c9db4d9
-#+s6-portable-utils.2d3e0e2aecdf67c788caff7809c4b2880d4c70e855e3551db69b4a52d2345187
-#+s6-linux-utils.89d1a4d5ccf1de14c59411eb7c04779610b1863bf6a0b4c8e646dfbee04544a2
-#+zsh.b2e3d0846aaa9fbaff883701998485f288f4cebfdcedabc88d3140162c6bc6b3
-#+confz.d0db483cef072b2fefbf5e7c8561b56d9460a431865d1d050e59e063f37339d0
-#+containers.315cef2ed7378e66a71b7d918dd1fac5f60e11b949cb1e22f65cad607768c89b
-#+xbps.2a97d80dfbff70cdd481a5f611f189dec25604feb2a036d846e4694f0104717f
-#+zstd.c1107c320609d03324f44b811645887857b5858b8b443e1892459697d08d6f6c
-#+apk-tools.1c16fab9d946f7bbdecf734700681d37a013ab60a45c9624270345004a20eefd
-#+alpine-keys.18727edd0ccf78240524c73dab1934ed2af6b447906232335dd8cc788e6cd2bb
-#+getent.6938ab9105e01fb023c90f77721ded92d4af96fe4ca1780cf2587bf72cf1c1f6
-#+fileset.e83e65120cbc6d8d6f49d3f8781abc2bf15c55e7422283d36288dca3c1c70a82
-#+ccx-utils.ce34c3f8769025b772d7d1e8bb0ba77b525f890a862e2e050757593e3bbb2399
-#+easyseccomp.10d4f543ffc322077224e1a078550353f6b8e630d5e5e933493b526e22b91c54
-#+findutils.0754535d9a07170d7e9433fcb020486c8efd4d8d8d8bb604d56428302e3e8068
-#+nawk.3d4adac0ba89766e0cafa44e623d55d4318d90e397bf76e0cf69011d7c059f07-
\ No newline at end of file
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-dosfstools.bd9f2a329ddc9500a0b1d41767f0f4c80465d5d9af7f5d373666a51d35ae48ec
+#+busybox-e2fsprogs.2c541e5e1c8b7d2c147f6160d3ab92d89292a22b40fcf012c2ff1e709be394f4
+#+busybox-iproute2.a62d2e42193917f401c9a64e9fbbc97fc91e4a6064e886afa4210064cf1848d3
+#+busybox-iputils.71b6dbfef6b576a24160e102004c80aaf7837038bf42457b40215d38b80c9a5c
+#+busybox-net-misc.8f7dba414abce07473c2a3821086eb5147a2099a921d2365a81a3c16fa975fc2
+#+busybox-net-tools.cd08a41275209fb450e1a51c5d2c7de1abcdfe263190d0479e23d396fd0a61eb
+#+busybox-traceroute.c400683e9bf8d40f2d3b5236cac481e192fa0eaa6ab5dfabfbfffd365e8b8b50
+#+busybox-wget.79b50d20c9545dd941e0434bd64504d8369d24a4300304eeeb05ba3018affd5b
+#+busybox-chpst.955df8c837a844e1f1ffa117dedad7f202b85b3249be89901ccbcf28c5c7b805
+#+busybox-console.738d93ed50aee55c7f727fe85af0dbfad5897923e1c4ae0212538482d02009e6
+#+busybox-getty.86d09199ca03e869469ddca340377204d852bb2c1ea1b1712bf4276ce915641d
+#+busybox-i2c-tools.ba8892e9b938d0f9f26d6abf912400dd699bd9dd9ea5117be1c982d081f4b854
+#+busybox-linux-extra.ba3ab388d30aae158923323d139d36824359ef91e245dcd3c3d51d9dba00dae6
+#+busybox-mtd-utils.d4cfd607db2e0da3c1b9914aa67600440dc1dbdf57ed31a8f3ca95824d2607c7
+#+busybox-shadow.8ace403350ee33fa804385f4ae1c957ec0f4b26a031e23d74493a8bd96191e33
+#+busybox-su.b7030f31914b1f2d4e1c6d1f94ec207a51064374faffdd73962e64b955457983
+#+busybox-util-linux-priv.39d056aa0e75b5d17fb08a4b79898a4a8a9d3dbc05e4da8d98a963db36ba87ec
+#+busybox-logging.0f3cb2c5ebf2debb281e35c86d902094af5ba3be298cb32ae940fc0c53388d15
+#+busybox-cron.e7d9db51b1fbbd3961867e5c1eb18318223a7935da074f833636f3acb2db180f
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+execline.2d9890704cb30e173554301ee68511361318af7395d96396d35c302e5dff922e
+#+s6.072c6be2de59334ae0f8fe3b95baa3fce42bf15b25d8d4c2162b68f794a1f19b
+#+s6-portable-utils.02792dece4e2daeccf961730e6272997049a8860462f4255a078142d4c3c6eaf
+#+s6-linux-utils.2a736046fe6da8024685322b3df7004d1f280c5d3d153ad5ef348d471492cdf9
+#+zsh.fcffbffcb0c0c3352f1cbfa0cc46559dfa56aa4095d5877892aa4b0e021fdc74
+#+confz.48817522c80a912157ee1e772af0adcb74de530ba60d7a6ac2764cf06c0251f8
+#+containers.4d7cb90d7e6d23fce7fb936fe044c1ed48a29dfe5a1f7faf613ac9e6cdf3c256
+#+xbps.8865f2eff3e57ef75a2ca02a50e2be7c02e7d0a5e53aa1e7dfd825c4e849ac0e
+#+zstd.1bfd81018a42b01b2b301cfc74c160e4137f03a31a0adeaa86a6569cc95b1717
+#+apk-tools.8c72a3f01914e3e9f5da89cd3e9ca1f863b90e45d35057e42a52a6fc0dc12094
+#+alpine-keys.2a8d3c2cf05da31b5f0eeb106ccd5f86adb5067ff808f5359139c8da2fa55d06
+#+getent.6cda7a824c09f711c5d31134f9ecee6caf60b55d8e63ad542126febda7f7faf1
+#+fileset.256b78923a82e97a653e2576f2689bc8c0e83e0de36228c5ac6a008e489d547d
+#+ccx-utils.c67eb9f7f7362065137149d680038c399d65e4c0f0f71a33e6325d9deb632d60
+#+easyseccomp.7a20108daf3b7a6044b78e72427ed6af02004b0b74baf85be4ff0cee4c2a3899
+#+findutils.cdfc3f51aa3ba16c570868fa255761c70bf2eb952c4be03e84b8f0c760e07570
+#+nawk.257a482c0dc30655341c73bf73ba2548fd6c9a85b1be5fddc14b0504a0534e86+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/curl b/variants/ccx-x86_64/curl
@@ -1,37 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+m4.6f7bd3298835d0609008d0fbdb57c9ba9867d8710ad92c1fbdc644f1f6e0ac73
-#+libressl.0e2a2d650925ed59678ae580bd35afecdf5b3b5704b1d86d990ad3ff223dcb84
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+m4.30d10cc3eee1114a0e9c629a357a10cc0b9acc4d5eff1c594d6ed9a1db30462f
+#+libressl.149d83ff736e1ca773a90e36086cd74e89942d184091ed5ac7a6470bcf6c3ef5
 #@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:.
 
 
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -1,96 +1,98 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-dosfstools.983566a17821fcb32de0dddb7d6e785978c7273a96fc2351328089f9b600a4b9
-#+busybox-e2fsprogs.8f553a043e9d98e5e9d7268a166f7384a119d4819491a8839add7fc8ddb11892
-#+busybox-iproute2.81e4a1c96593d1bd624ee0bb11a204e0534c0b1cdc2c2e264a798f7569c52aca
-#+busybox-iputils.446fea1101fdfdf8b1b5af0ad5a4b2d2aa29adcaad812657ae48591fd224a396
-#+busybox-net-misc.ca6a84e212d8f555a0eac8637c83af010eca98db095db6f59171d35f91bc6935
-#+busybox-net-tools.f75ed05accc163299209dd375747e79e74e2d339373e6a80e6fe9373019cd6cb
-#+busybox-traceroute.1b0be7e3408d7589fa42d9e8f6a35cbb731297ed1c31e85ab87c9455d6b41068
-#+busybox-wget.b1eabcbee77e23b2340e1d3728d08f2565d5ec2a85ad485524f640b0cf69607e
-#+busybox-chpst.4b8ecfc8e205aee07b69f3e84d25b36637f765f53104f264f6f1c6fddda421e7
-#+busybox-console.8c83a1e67dcbd4ed580eadbbede4b0fec4f39ba77eb7a88f3c7113fca3b1a4f2
-#+busybox-getty.fc722cd28dddbc98d4991e91f764175fbe14d0636cf7e9e7d2f6149686ecb97e
-#+busybox-i2c-tools.48da2f9070109fcd7b1c6b437e5594c7331833411a67d74bece7751d8caba5e4
-#+busybox-linux-extra.8fec0ca34fa9ccc3eb472504473966830b1fa2c3c312a43f1d85867cea375fbc
-#+busybox-mtd-utils.1b7a0851def92f071f7230dc1e5b43d5b1cf7dc93de43d5392eaf97618fb90b9
-#+busybox-shadow.e05e541ad31c2afda4d355ab59727b2cf277e7047cfe312689a3d56bf3e2f593
-#+busybox-su.3151f0c0e0d3703fd8da9933b3fbe21bb51a78140d8caaa990e375f61c95d60e
-#+busybox-util-linux-priv.b38cb2fdda0edc168b3174cf7fc77eb101dcf56b6455d886fc931571120317ae
-#+busybox-logging.8282676a88f6e0bfc4a85146e7130c07749d58a5e9cc66d5e45ca8aa955f725f
-#+busybox-cron.dcf107e80707f311473e574da4dae533dc5944aa528156e7dfeedde136fad677
-#+attr.60365a4287f9b558c08915449f9df46bce037011889df1ae7ac2be0346a324e6
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+diffutils.2b09d2d83c94d2c37771fd4f753e86e8353ee88125c07a6230c6c0d219dc1bff
-#+patch.141394d3463b9153bdd6b421d8f10b79dd1c458eafb2244bd9af5d7638e67a08
-#+flex.7dec2a01c6efef521a5a6c4ebc6b04c2375a2b25812bf4cdbff26899deabc771
-#+bison.8af5e3d228dac6d59cb1010846136f9be107b4af139ab788ba8aad87195a98ff
-#+rsync.0ca6bbb420c9bdf6e275ff83e55e05eb3913d856e06eb13b4b01ef7fbe5d7198
-#+execline.98b288bf884e98dfd1774d38c3ce0cd767b1c122ae8582ce137ee9f7d325e67b
-#+s6.8c7ff734f64e9c89d65907441f5ca6058d8e7eb56d19f44ec7bd9c1e1c9db4d9
-#+s6-rc.d71d713f11f2ae7ce2d47bf977e8a3081c0ed5b9cb70bb24724998e84f8a8151
-#+s6-portable-utils.2d3e0e2aecdf67c788caff7809c4b2880d4c70e855e3551db69b4a52d2345187
-#+s6-linux-utils.89d1a4d5ccf1de14c59411eb7c04779610b1863bf6a0b4c8e646dfbee04544a2
-#+s6-linux-init.a02af645467653d1ae0c475ebbae7551976427f3f08e42e9eb574ee115ad070b
-#+mdevd.11651871fcf02c1e7564f18b16ede6717c1b41e0218727b5f954f6c22b8d461d
-#+s6-dns.d0406727680d045dcd4881e79b9594a95f48972e0ccaaddf71c5f045fd2b8075
-#+libressl.0e2a2d650925ed59678ae580bd35afecdf5b3b5704b1d86d990ad3ff223dcb84
-#+s6-networking.24f605db99103f37a846eca20da34edb8fa272b1e4342724153c0492e7df2ace
-#+zsh.b2e3d0846aaa9fbaff883701998485f288f4cebfdcedabc88d3140162c6bc6b3
-#+pthbs-banginstall.a459b0c5dfd826f3cdbf00e997067dffc3d4f7ec54ff46e47567b1f2b276805d
-#+aat.97fbb40d245ea2984c869eb6f1e8c19485da1a82fd8fea4ed8b3b687c5dd9ef4
-#+confz.d0db483cef072b2fefbf5e7c8561b56d9460a431865d1d050e59e063f37339d0
-#+containers.315cef2ed7378e66a71b7d918dd1fac5f60e11b949cb1e22f65cad607768c89b
-#+fileset.e83e65120cbc6d8d6f49d3f8781abc2bf15c55e7422283d36288dca3c1c70a82
-#+logincaps.34d03123840db91f340c267337e1fd2d43fee0d95c8b6f711de7ff2c3ffb34e0
-#+snaprep.d44dcab3a919277ad36db507def93c5699006c4ca33280088bf5ca7fc152b8d0
-#+curl.9dade7e2f0a81d8dc07a96e32b5d0ff931bbcf951ebb1083082085e4b32d49d5
-#+git.bd9f1333f980b807b9ab7c74f5096de0b5e907b25ea69e7d05d89e9a497a5857
-#+xbps.2a97d80dfbff70cdd481a5f611f189dec25604feb2a036d846e4694f0104717f
-#+apk-tools.1c16fab9d946f7bbdecf734700681d37a013ab60a45c9624270345004a20eefd
-#+getent.6938ab9105e01fb023c90f77721ded92d4af96fe4ca1780cf2587bf72cf1c1f6
-#+getconf.9e5df47fc7bfe1a480fab7b42a834c583d6ecd6f9c0528feef768451c8296246
-#+iconv.2cfbb56faa65804fca0297490c7e3b1a14e5de4d64e7b7e331213ce0a6ec29e6
-#+libcap.3d1d91f4a1728a27046d5ef5c0b4eefc60cfe82824ce1272b7e0a7c6b9e78808
-#+applyuidgid-caps.313a50f6417964d873219b51d963215764840372ba5dc304473976a088c97fc4
-#+ccx-utils.ce34c3f8769025b772d7d1e8bb0ba77b525f890a862e2e050757593e3bbb2399
-#+user-env.e95f921c0e0c46a687a87dd8e6463b843ba738b3b1407a8a2247e8ac1e37c449
-#+strace.6d6f3c5a61aae048c5eac726643f58360efe34c476c31e229fbdb4389d32c568
-#+mlog.4dc4985f2bf9e890262e110ab9a9cbe4e71c02ea6cdd507a72b565a0b6fd48a4
-#+findutils.0754535d9a07170d7e9433fcb020486c8efd4d8d8d8bb604d56428302e3e8068
-#+nawk.3d4adac0ba89766e0cafa44e623d55d4318d90e397bf76e0cf69011d7c059f07
-#+squashfs-tools.fede6a731c8113a0e88074f0739f238ab7c41763bc16b876a624f25baee216be
-#+mandoc.45fe2e711d973ff4dd18f201ac24cdf4ada609fe8ec1379a9c4cbb27844e0311
-#+tinyssh.681544a55eadc347b0ffd5f3188f97d8bb23d6c40930d0b9e42b1a6745bf4dcb
-#+system-config.9e0d352ef25be318f6f0a49eecbd83b255a96a6275b09a92d52c2df14e3e186e
-#+system-config-rc.16fe4c732f5af91d1fc1dfd6bcf0d831f4ccc1213105c1110c68a656bef9c860
-#+system-config-scripts.52163cfdd9131da0193b818dd60fed63a4746e5b09f4ce7ee6db426361cda207
-#+system-config-init.0f84b3d50c51e414c049299555f28b12a8781ba039d6852b7f2d79e888ddcd33
-#+system-config-zsh.592f359139abbdcfd8e1c373300129c36b19b32a101f2ef08c3abdacd379cd4f
-#+busybox.892e0a7f8d598c92df2a50eeeaec5012295a610bc578da7c58f0d6fbd30eaf67-
\ No newline at end of file
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-dosfstools.bd9f2a329ddc9500a0b1d41767f0f4c80465d5d9af7f5d373666a51d35ae48ec
+#+busybox-e2fsprogs.2c541e5e1c8b7d2c147f6160d3ab92d89292a22b40fcf012c2ff1e709be394f4
+#+busybox-iproute2.a62d2e42193917f401c9a64e9fbbc97fc91e4a6064e886afa4210064cf1848d3
+#+busybox-iputils.71b6dbfef6b576a24160e102004c80aaf7837038bf42457b40215d38b80c9a5c
+#+busybox-net-misc.8f7dba414abce07473c2a3821086eb5147a2099a921d2365a81a3c16fa975fc2
+#+busybox-net-tools.cd08a41275209fb450e1a51c5d2c7de1abcdfe263190d0479e23d396fd0a61eb
+#+busybox-traceroute.c400683e9bf8d40f2d3b5236cac481e192fa0eaa6ab5dfabfbfffd365e8b8b50
+#+busybox-wget.79b50d20c9545dd941e0434bd64504d8369d24a4300304eeeb05ba3018affd5b
+#+busybox-chpst.955df8c837a844e1f1ffa117dedad7f202b85b3249be89901ccbcf28c5c7b805
+#+busybox-console.738d93ed50aee55c7f727fe85af0dbfad5897923e1c4ae0212538482d02009e6
+#+busybox-getty.86d09199ca03e869469ddca340377204d852bb2c1ea1b1712bf4276ce915641d
+#+busybox-i2c-tools.ba8892e9b938d0f9f26d6abf912400dd699bd9dd9ea5117be1c982d081f4b854
+#+busybox-linux-extra.ba3ab388d30aae158923323d139d36824359ef91e245dcd3c3d51d9dba00dae6
+#+busybox-mtd-utils.d4cfd607db2e0da3c1b9914aa67600440dc1dbdf57ed31a8f3ca95824d2607c7
+#+busybox-shadow.8ace403350ee33fa804385f4ae1c957ec0f4b26a031e23d74493a8bd96191e33
+#+busybox-su.b7030f31914b1f2d4e1c6d1f94ec207a51064374faffdd73962e64b955457983
+#+busybox-util-linux-priv.39d056aa0e75b5d17fb08a4b79898a4a8a9d3dbc05e4da8d98a963db36ba87ec
+#+busybox-logging.0f3cb2c5ebf2debb281e35c86d902094af5ba3be298cb32ae940fc0c53388d15
+#+busybox-cron.e7d9db51b1fbbd3961867e5c1eb18318223a7935da074f833636f3acb2db180f
+#+attr.669f424a8e22c718fb05548f0588af500a05bd3e731c7d4492e9d94dd19c9ae8
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+diffutils.f4b7fa30ef951de0112469f276961b9e968b1d4e712eecb38a2ae62587d4d18c
+#+patch.6a227048016d19b54309e21e725a704d23707bb366d384df4cd30eaccaae3f55
+#+flex.0f73e9b8fa28dc3baf349d08527e0d33926692a897f6efe26519a4c9d901aad4
+#+bison.336db60a3e340b6f18968c281b378d99a16637d0f94c8e26de83882275b643bc
+#+rsync.d52f4b040894f801b7ef5bdf0020ca5148e3a381dfe5b8ab59986eae01385461
+#+execline.2d9890704cb30e173554301ee68511361318af7395d96396d35c302e5dff922e
+#+s6.072c6be2de59334ae0f8fe3b95baa3fce42bf15b25d8d4c2162b68f794a1f19b
+#+s6-rc.12efc7aa415a2788813c2e120799306826f0d36272e744925d1d5a63d4b6122d
+#+s6-portable-utils.02792dece4e2daeccf961730e6272997049a8860462f4255a078142d4c3c6eaf
+#+s6-linux-utils.2a736046fe6da8024685322b3df7004d1f280c5d3d153ad5ef348d471492cdf9
+#+s6-linux-init.4cba678d2813e4f52f7010eeb4f83cf4059e156cb62ab3f2b992a54b0e1485e0
+#+mdevd.1265568607a05bbece20d9a210b1531ac511fcc0bca46a00fa5afebe563198dd
+#+s6-dns.b5c5ba9bee67c7c21488e97008762d870857651f32018adcce746fc884e2e817
+#+libressl.149d83ff736e1ca773a90e36086cd74e89942d184091ed5ac7a6470bcf6c3ef5
+#+s6-networking.391cd4ee13a0d22df24847dd53d6afdb13dedeeec2e747cce2057dd77c958805
+#+zsh.fcffbffcb0c0c3352f1cbfa0cc46559dfa56aa4095d5877892aa4b0e021fdc74
+#+pthbs-banginstall.576ac5077b84a6b4fe98be3f49056422e94f7f547287656cd09e8fce9ce3bd7d
+#+aat.98efcd00ec59fc8aacb8047bca22053d481e6795939951f703d7a739c510bc40
+#+confz.48817522c80a912157ee1e772af0adcb74de530ba60d7a6ac2764cf06c0251f8
+#+containers.4d7cb90d7e6d23fce7fb936fe044c1ed48a29dfe5a1f7faf613ac9e6cdf3c256
+#+fileset.256b78923a82e97a653e2576f2689bc8c0e83e0de36228c5ac6a008e489d547d
+#+logincaps.480b5cffcb1f7426ca400b41f7947d610dad8227dce5f026cd32f95e52b87cef
+#+snaprep.5d1269242bee362d9f6cb02127b304af238d438d9a525cd3b3e5651cadfb454f
+#+curl.571bad230d49f6ade91d0a376f99160e4d4906fbbfa6400ac6aa723e9eaa33c6
+#+git.9eb5d29be3f0076fa393b48b3138261071d328ed29ec18657a925141905fa348
+#+xbps.8865f2eff3e57ef75a2ca02a50e2be7c02e7d0a5e53aa1e7dfd825c4e849ac0e
+#+apk-tools.8c72a3f01914e3e9f5da89cd3e9ca1f863b90e45d35057e42a52a6fc0dc12094
+#+getent.6cda7a824c09f711c5d31134f9ecee6caf60b55d8e63ad542126febda7f7faf1
+#+getconf.efbf676fd1b52e044fb94a9fc87dd6609c5d3dd77330c5bba57fefbc54bdd5cc
+#+iconv.97a24f5267efac78b9e2025c4324d1e4e697943286ea0b28a31318950a1ce12c
+#+libcap.da38f24016be4eff73b3862da403658da0107cc476b4c5c269569b38c7e133a0
+#+applyuidgid-caps.3b7dff1fcc8c671e9c560bdd26bddb6d79b8f1627b621f389d4c406499f8f774
+#+ccx-utils.c67eb9f7f7362065137149d680038c399d65e4c0f0f71a33e6325d9deb632d60
+#+user-env.1bbd01a8daeaae080114bec91290731b1041aa0b2dc822c5f9ac1ecf9687e222
+#+strace.7f504b860e64b901c69efe1a85368693a9dd417c17562863161e21ae16f9cb42
+#+mlog.893b660f52f7c23261f952767c8d77be1549026c56e6eb607a49b069b264395a
+#+findutils.cdfc3f51aa3ba16c570868fa255761c70bf2eb952c4be03e84b8f0c760e07570
+#+nawk.257a482c0dc30655341c73bf73ba2548fd6c9a85b1be5fddc14b0504a0534e86
+#+squashfs-tools.1c25de720bbf1bc2eab2db00724e1058b338fbf27743fc476c31ca9490b2b450
+#+mandoc.3f2711a4e8e4db5685e56c96e6ed6a1e4f88c68bcfedaa164afcd72381778b00
+#+tinyssh.2b45b71634006774dccbc19be36d0b45c370266573dd7c292afcd15b805da21c
+#+system-config.9ea8f5c3be59c17175dad30ed8559b68ce6a93d84d5be6686a1f735c7696d2df
+#+system-config-rc.fcf032d58123f65081a4f4540d0405381e6b6448e9c8dfacef9e063912f07997
+#+system-config-scripts.25fcfa99368483229e2156af03bdbbd5f71555da83d46ce679cbaa34152f2aee
+#+system-config-init.c4d3dbfc582cf525a53edbe2a36824947609ada5ba921ad3fe99df1a33df13a0
+#+system-config-zsh.c504e9520c34d366173b81ec75499a9f51fb6e3edcdb6b7f634e89f33118e8a5
+#+busybox.e49e298fec9b4216e00b954eca497cf2eb0809b2f23a2bc4956404b389b6bf1b+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/diffutils b/variants/ccx-x86_64/diffutils
@@ -1,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+m4.6f7bd3298835d0609008d0fbdb57c9ba9867d8710ad92c1fbdc644f1f6e0ac73
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+m4.30d10cc3eee1114a0e9c629a357a10cc0b9acc4d5eff1c594d6ed9a1db30462f
 #@untar:-J:sha256:90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e:.
 
 
diff --git a/variants/ccx-x86_64/dune b/variants/ccx-x86_64/dune
@@ -1,35 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+ocaml.68b79e30d5d49e1998cb84f3738802255f84ee52504f41e8163bb20220e5a5b5
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+ocaml.72417b373964682f23d84717f6ed50a8c0e1e625b0a3000deebee06c262e93f0
 #@untar:-z:sha256:579c738f8ca191ba0a9b22dbe78f1377542442c9827cf4939f8964f09f9edb28:.
 
 
@@ -49,7 +51,7 @@ check_dynamic() {
 			printf '%s\n' "Error: '$1' is not a dynamic binary!"
 			exit 1
 			;;
-		(*'/home/ccx/versions/musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/home/ccx/versions/musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
 			return 0
 			;;
 		(*)
diff --git a/variants/ccx-x86_64/easyseccomp b/variants/ccx-x86_64/easyseccomp
@@ -1,42 +1,44 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+m4.6f7bd3298835d0609008d0fbdb57c9ba9867d8710ad92c1fbdc644f1f6e0ac73
-#+patch.141394d3463b9153bdd6b421d8f10b79dd1c458eafb2244bd9af5d7638e67a08
-#+flex.7dec2a01c6efef521a5a6c4ebc6b04c2375a2b25812bf4cdbff26899deabc771
-#+bison.8af5e3d228dac6d59cb1010846136f9be107b4af139ab788ba8aad87195a98ff
-#+libseccomp.e8eea67fc0c9949c6cdb8dbe4a7f1712d07113eab395b1967409860c179653de
-#+error-standalone.0e451ba5af9a3446576910ba5e146cf2ca46533aad83c7550ea126a3f4f84f03
-#+argp-standalone.09884354ad8a0274deeae1e119202e7c4dd2bcae3ab4abfb334c801e440bd0c4
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+m4.30d10cc3eee1114a0e9c629a357a10cc0b9acc4d5eff1c594d6ed9a1db30462f
+#+patch.6a227048016d19b54309e21e725a704d23707bb366d384df4cd30eaccaae3f55
+#+flex.0f73e9b8fa28dc3baf349d08527e0d33926692a897f6efe26519a4c9d901aad4
+#+bison.336db60a3e340b6f18968c281b378d99a16637d0f94c8e26de83882275b643bc
+#+libseccomp.ec47fb080ef7ba5ec6d1c6bda80f64267fb6ea67b718bd20a717c79b4a2201d2
+#+error-standalone.8029d2c0cc07f12bcab0885df5786c1ba8bc1dc63a1647375abdd514e34602ee
+#+argp-standalone.b8247d33610c224b6cd2d861afa4563313bba4f0a8f02880d5dee7f6ae44073c
 #@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,35 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
 #@untar:-z:sha256:0e751989cea94e25d5166a6a1ed9bde218786e39dff82e1f01dff12fc78639d9:.
 
 
diff --git a/variants/ccx-x86_64/execline b/variants/ccx-x86_64/execline
@@ -1,35 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+skalibs.4c6bb8bcee00bd264a1cf26c17e36d7155f840f53128be18cdd5d1f00db157eb
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+skalibs.04e057b8769ebec90f4eaa3993bed48a602f6bdf88a558bf173827bbbbd44392
 #@git:6c0957eb5e8eea2ffada4d7be08286f0e81d0527:execline
 
 
@@ -46,7 +48,7 @@ cd 'execline'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.4c6bb8bcee00bd264a1cf26c17e36d7155f840f53128be18cdd5d1f00db157eb/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.04e057b8769ebec90f4eaa3993bed48a602f6bdf88a558bf173827bbbbd44392/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.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+zsh.b2e3d0846aaa9fbaff883701998485f288f4cebfdcedabc88d3140162c6bc6b3
-#+pthbs-banginstall.a459b0c5dfd826f3cdbf00e997067dffc3d4f7ec54ff46e47567b1f2b276805d
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+zsh.fcffbffcb0c0c3352f1cbfa0cc46559dfa56aa4095d5877892aa4b0e021fdc74
+#+pthbs-banginstall.576ac5077b84a6b4fe98be3f49056422e94f7f547287656cd09e8fce9ce3bd7d
 #@git:1b161b09bc889d17ac0a4ccce2dc3e74b64e1433:fileset
 
 
diff --git a/variants/ccx-x86_64/findutils b/variants/ccx-x86_64/findutils
@@ -1,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+m4.6f7bd3298835d0609008d0fbdb57c9ba9867d8710ad92c1fbdc644f1f6e0ac73
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+m4.30d10cc3eee1114a0e9c629a357a10cc0b9acc4d5eff1c594d6ed9a1db30462f
 #@untar:-J:sha256:1387e0b67ff247d2abde998f90dfbf70c1491391a59ddfecb8ae698789f0a4f5:.
 
 
diff --git a/variants/ccx-x86_64/flex b/variants/ccx-x86_64/flex
@@ -1,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+m4.6f7bd3298835d0609008d0fbdb57c9ba9867d8710ad92c1fbdc644f1f6e0ac73
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+m4.30d10cc3eee1114a0e9c629a357a10cc0b9acc4d5eff1c594d6ed9a1db30462f
 #@untar:-z:sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995:.
 
 
diff --git a/variants/ccx-x86_64/gcc b/variants/ccx-x86_64/gcc
@@ -2,6 +2,11 @@
 #+musl-cross-make.76cf279d5ad4a8701de2ea5025aa8e2e94f0bcbf79eee534d7e66197c6c853c1
 #+gnu-make.f2ed650e0fc6741ae940145d114a932779251b577642c9c7b42f5d3fc1b8a7cb
 #+busybox.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gmp.6670744de1a602f140f63618c9c589fe9a57349cf7c163403f4b360ffb463a0e
+#+mpc.60677c8a84c8d33ebdb3972ecd1039e2a97f339d32545ee12f55ce1c3c87658a
+#+mpfr.c4dfdaa98f7ab7e93b8d1c91d4697cdd1e76a55479aa6ac57426401a06670cd2
 #@sha256:62eb68290502d54b16457509aa0c3995a84116408e6b593d676b9f4c03b6b160:merged.patch
 #@untar:-J:sha256:e0dc77297625631ac8e50fa92fffefe899a4eb702592da5c32ef04e2293aca3a:.
 
@@ -79,14 +84,13 @@ make \
 	MAKEINFO=false \
 	MAKE="make MULTILIB_OSDIRNAMES= INFO_DEPS= infodir= ac_cv_prog_lex_root=lex.yy MAKEINFO=false "
 make \
-	MULTILIB_OSDIRNAMES= \
-	INFO_DEPS= \
-	infodir= \
-	ac_cv_prog_lex_root=lex.yy \
-	MAKEINFO=false \
-	AR="$mcm/bin/x86_64-linux-musl-ar "\
-	RANLIB="$mcm/bin/x86_64-linux-musl-ranlib" \
-	DESTDIR="$dest" \
+	'MULTILIB_OSDIRNAMES=' \
+	'INFO_DEPS=' \
+	'infodir=' \
+	'ac_cv_prog_lex_root=lex.yy' \
+	'MAKEINFO=false' \
+	'MAKE=make MULTILIB_OSDIRNAMES= INFO_DEPS= infodir= ac_cv_prog_lex_root=lex.yy MAKEINFO=false ' \
+	"DESTDIR=$dest" \
 	install
 
 
diff --git a/variants/ccx-x86_64/getconf b/variants/ccx-x86_64/getconf
@@ -1,33 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
 #@sha256:d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae50e320aad247c:getconf.c
 
 
diff --git a/variants/ccx-x86_64/getent b/variants/ccx-x86_64/getent
@@ -1,33 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
 #@sha256:002c1a216f6bed0f816ab1cfebde94a0b127193ef410c36b2190599983e015b8:getent.c
 
 
diff --git a/variants/ccx-x86_64/git b/variants/ccx-x86_64/git
@@ -1,38 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+m4.6f7bd3298835d0609008d0fbdb57c9ba9867d8710ad92c1fbdc644f1f6e0ac73
-#+libressl.0e2a2d650925ed59678ae580bd35afecdf5b3b5704b1d86d990ad3ff223dcb84
-#+curl.9dade7e2f0a81d8dc07a96e32b5d0ff931bbcf951ebb1083082085e4b32d49d5
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+m4.30d10cc3eee1114a0e9c629a357a10cc0b9acc4d5eff1c594d6ed9a1db30462f
+#+libressl.149d83ff736e1ca773a90e36086cd74e89942d184091ed5ac7a6470bcf6c3ef5
+#+curl.571bad230d49f6ade91d0a376f99160e4d4906fbbfa6400ac6aa723e9eaa33c6
 #@untar:-J:sha256:f612c1abc63557d50ad3849863fc9109670139fc9901e574460ec76e0511adb9:.
 
 
diff --git a/variants/ccx-x86_64/gnu-make b/variants/ccx-x86_64/gnu-make
@@ -1,5 +1,7 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
 #+gnu-make.f2ed650e0fc6741ae940145d114a932779251b577642c9c7b42f5d3fc1b8a7cb
 #+busybox.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
diff --git a/variants/ccx-x86_64/gperf b/variants/ccx-x86_64/gperf
@@ -1,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+m4.6f7bd3298835d0609008d0fbdb57c9ba9867d8710ad92c1fbdc644f1f6e0ac73
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+m4.30d10cc3eee1114a0e9c629a357a10cc0b9acc4d5eff1c594d6ed9a1db30462f
 #@untar:-z:sha256:588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2:.
 
 
diff --git a/variants/ccx-x86_64/iconv b/variants/ccx-x86_64/iconv
@@ -1,33 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
 #@sha256:f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7:iconv.c
 
 
diff --git a/variants/ccx-x86_64/kbd b/variants/ccx-x86_64/kbd
@@ -1,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+m4.6f7bd3298835d0609008d0fbdb57c9ba9867d8710ad92c1fbdc644f1f6e0ac73
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+m4.30d10cc3eee1114a0e9c629a357a10cc0b9acc4d5eff1c594d6ed9a1db30462f
 #@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.55844d58fdfeaeff910a4223faa23e9bb02bccd67b44af310d6ebf2fa381c2e3
-#+busybox.892e0a7f8d598c92df2a50eeeaec5012295a610bc578da7c58f0d6fbd30eaf67-
\ No newline at end of file
+#+linux-qemu-guest.4c311dd129df592d1c7db541bac5a9e7f12bb45479daa914799d93a486dc4e3c
+#+busybox.e49e298fec9b4216e00b954eca497cf2eb0809b2f23a2bc4956404b389b6bf1b+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/libarchive b/variants/ccx-x86_64/libarchive
@@ -1,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+m4.6f7bd3298835d0609008d0fbdb57c9ba9867d8710ad92c1fbdc644f1f6e0ac73
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+m4.30d10cc3eee1114a0e9c629a357a10cc0b9acc4d5eff1c594d6ed9a1db30462f
 #@untar:-J:sha256:04357661e6717b6941682cde02ad741ae4819c67a260593dfb2431861b251acb:.
 
 
diff --git a/variants/ccx-x86_64/libbsd b/variants/ccx-x86_64/libbsd
@@ -1,37 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+m4.6f7bd3298835d0609008d0fbdb57c9ba9867d8710ad92c1fbdc644f1f6e0ac73
-#+libmd.f59adcb081edeba6c0bf0c0380cbee45100f0e8815b9bbc2eb18f88d0d00b9d7
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+m4.30d10cc3eee1114a0e9c629a357a10cc0b9acc4d5eff1c594d6ed9a1db30462f
+#+libmd.80dff427e30bad96aebf2ffb1e63089ca6f5e36aeb5433847a917225c70cad8e
 #@untar:-J:sha256:55fdfa2696fb4d55a592fa9ad14a9df897c7b0008ddb3b30c419914841f85f33:.
 
 
diff --git a/variants/ccx-x86_64/libcap b/variants/ccx-x86_64/libcap
@@ -1,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+pkgconf-pkg-config.8f6b75c4c3fab946cd53a5ea0154ed8133db1909133a64e0c9696cb120af6bc7
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+pkgconf-pkg-config.9aa3902fbb930df881f7e5402b8c784ef1672caccff791830d913246ee8fd5c9
 #@untar:-J:sha256:f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb:.
 
 
diff --git a/variants/ccx-x86_64/libcgroup b/variants/ccx-x86_64/libcgroup
@@ -1,39 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+m4.6f7bd3298835d0609008d0fbdb57c9ba9867d8710ad92c1fbdc644f1f6e0ac73
-#+flex.7dec2a01c6efef521a5a6c4ebc6b04c2375a2b25812bf4cdbff26899deabc771
-#+bison.8af5e3d228dac6d59cb1010846136f9be107b4af139ab788ba8aad87195a98ff
-#+musl-fts.d4d5629eb5d8ab48f84d2fee5ff2b27350bffd112695c3a6e0c214edc8da4111
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+m4.30d10cc3eee1114a0e9c629a357a10cc0b9acc4d5eff1c594d6ed9a1db30462f
+#+flex.0f73e9b8fa28dc3baf349d08527e0d33926692a897f6efe26519a4c9d901aad4
+#+bison.336db60a3e340b6f18968c281b378d99a16637d0f94c8e26de83882275b643bc
+#+musl-fts.d64b4714bd384353627f8327e0f592634194559d50bfb9430e6510c83c9508ff
 #@untar:-z:sha256:8d284d896fca1c981b55850e92acd3ad9648a69227c028dda7ae3402af878edd:.
 
 
diff --git a/variants/ccx-x86_64/libelf b/variants/ccx-x86_64/libelf
@@ -1,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+zstd.c1107c320609d03324f44b811645887857b5858b8b443e1892459697d08d6f6c
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+zstd.1bfd81018a42b01b2b301cfc74c160e4137f03a31a0adeaa86a6569cc95b1717
 #@git:288355d104ff9930520c0283fe82556c6cc5c16f:libelf
 
 
diff --git a/variants/ccx-x86_64/libmd b/variants/ccx-x86_64/libmd
@@ -1,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+m4.6f7bd3298835d0609008d0fbdb57c9ba9867d8710ad92c1fbdc644f1f6e0ac73
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+m4.30d10cc3eee1114a0e9c629a357a10cc0b9acc4d5eff1c594d6ed9a1db30462f
 #@untar:-J:sha256:1bd6aa42275313af3141c7cf2e5b964e8b1fd488025caf2f971f43b00776b332:.
 
 
diff --git a/variants/ccx-x86_64/libressl b/variants/ccx-x86_64/libressl
@@ -1,37 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+m4.6f7bd3298835d0609008d0fbdb57c9ba9867d8710ad92c1fbdc644f1f6e0ac73
-#+ca-certificates-wip-donotuse.f2e567a9947d70e15b29a118728f122d79ee941b0279ab8e09d9b4f38102eb9c
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+m4.30d10cc3eee1114a0e9c629a357a10cc0b9acc4d5eff1c594d6ed9a1db30462f
+#+ca-certificates-wip-donotuse.5562fcf399092ec49222983f3d24edfdf41dddc771f387e79b700f3a935cba8d
 #@sha256:a68fedc0edd976b9f35ecfdcb252d80dc12084b1bc4e945be7dc42c437d8b540:c_rehash.c
 #@untar:-z:sha256:6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954:.
 
@@ -99,7 +101,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.f2e567a9947d70e15b29a118728f122d79ee941b0279ab8e09d9b4f38102eb9c/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/"
+cp -vs '/home/ccx/versions/ca-certificates-wip-donotuse.5562fcf399092ec49222983f3d24edfdf41dddc771f387e79b700f3a935cba8d/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,38 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+m4.6f7bd3298835d0609008d0fbdb57c9ba9867d8710ad92c1fbdc644f1f6e0ac73
-#+pkgconf-pkg-config.8f6b75c4c3fab946cd53a5ea0154ed8133db1909133a64e0c9696cb120af6bc7
-#+gperf.860b7d7667bef4391ebd693bb84b0493f10dede265b2f8f49c7d9b8970b8d6b8
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+m4.30d10cc3eee1114a0e9c629a357a10cc0b9acc4d5eff1c594d6ed9a1db30462f
+#+pkgconf-pkg-config.9aa3902fbb930df881f7e5402b8c784ef1672caccff791830d913246ee8fd5c9
+#+gperf.03bf73b5ed72063513b2e1a85ad50abf97a66731e617c3973c564cd22a39b5dc
 #@untar:-z:sha256:83b6085232d1588c379dc9b9cae47bb37407cf262e6e74993c61ba72d2a784dc:.
 
 
diff --git a/variants/ccx-x86_64/libunwind b/variants/ccx-x86_64/libunwind
@@ -1,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+m4.6f7bd3298835d0609008d0fbdb57c9ba9867d8710ad92c1fbdc644f1f6e0ac73
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+m4.30d10cc3eee1114a0e9c629a357a10cc0b9acc4d5eff1c594d6ed9a1db30462f
 #@untar:-z:sha256:ddf0e32dd5fafe5283198d37e4bf9decf7ba1770b6e7e006c33e6df79e6a6157:.
 
 
diff --git a/variants/ccx-x86_64/linux b/variants/ccx-x86_64/linux
@@ -1,44 +1,46 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nofail_digest
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-modutils.a2def06765170a9e81090c9fb722648b096e77714b209a4fa70544c619c9c9df
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+findutils.0754535d9a07170d7e9433fcb020486c8efd4d8d8d8bb604d56428302e3e8068
-#+diffutils.2b09d2d83c94d2c37771fd4f753e86e8353ee88125c07a6230c6c0d219dc1bff
-#+patch.141394d3463b9153bdd6b421d8f10b79dd1c458eafb2244bd9af5d7638e67a08
-#+flex.7dec2a01c6efef521a5a6c4ebc6b04c2375a2b25812bf4cdbff26899deabc771
-#+bison.8af5e3d228dac6d59cb1010846136f9be107b4af139ab788ba8aad87195a98ff
-#+rsync.0ca6bbb420c9bdf6e275ff83e55e05eb3913d856e06eb13b4b01ef7fbe5d7198
-#+zstd.c1107c320609d03324f44b811645887857b5858b8b443e1892459697d08d6f6c
-#+libelf.ef296c43686a5ce996af405805c2a076a232e0a7e6af36779a507706022cebe2
-#+pkgconf-pkg-config.8f6b75c4c3fab946cd53a5ea0154ed8133db1909133a64e0c9696cb120af6bc7
-#+nawk.3d4adac0ba89766e0cafa44e623d55d4318d90e397bf76e0cf69011d7c059f07
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-modutils.f698dfbe59d0dd268802b88eff0b41314398b13f3a6d1e4253db78c7e1574a21
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+findutils.cdfc3f51aa3ba16c570868fa255761c70bf2eb952c4be03e84b8f0c760e07570
+#+diffutils.f4b7fa30ef951de0112469f276961b9e968b1d4e712eecb38a2ae62587d4d18c
+#+patch.6a227048016d19b54309e21e725a704d23707bb366d384df4cd30eaccaae3f55
+#+flex.0f73e9b8fa28dc3baf349d08527e0d33926692a897f6efe26519a4c9d901aad4
+#+bison.336db60a3e340b6f18968c281b378d99a16637d0f94c8e26de83882275b643bc
+#+rsync.d52f4b040894f801b7ef5bdf0020ca5148e3a381dfe5b8ab59986eae01385461
+#+zstd.1bfd81018a42b01b2b301cfc74c160e4137f03a31a0adeaa86a6569cc95b1717
+#+libelf.243e6634196a8f36df23d2c72661cdb74305df00fad85d6141ecfa5045589e55
+#+pkgconf-pkg-config.9aa3902fbb930df881f7e5402b8c784ef1672caccff791830d913246ee8fd5c9
+#+nawk.257a482c0dc30655341c73bf73ba2548fd6c9a85b1be5fddc14b0504a0534e86
 #@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,44 +1,46 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nofail_digest
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-modutils.a2def06765170a9e81090c9fb722648b096e77714b209a4fa70544c619c9c9df
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+findutils.0754535d9a07170d7e9433fcb020486c8efd4d8d8d8bb604d56428302e3e8068
-#+diffutils.2b09d2d83c94d2c37771fd4f753e86e8353ee88125c07a6230c6c0d219dc1bff
-#+patch.141394d3463b9153bdd6b421d8f10b79dd1c458eafb2244bd9af5d7638e67a08
-#+flex.7dec2a01c6efef521a5a6c4ebc6b04c2375a2b25812bf4cdbff26899deabc771
-#+bison.8af5e3d228dac6d59cb1010846136f9be107b4af139ab788ba8aad87195a98ff
-#+rsync.0ca6bbb420c9bdf6e275ff83e55e05eb3913d856e06eb13b4b01ef7fbe5d7198
-#+zstd.c1107c320609d03324f44b811645887857b5858b8b443e1892459697d08d6f6c
-#+libelf.ef296c43686a5ce996af405805c2a076a232e0a7e6af36779a507706022cebe2
-#+pkgconf-pkg-config.8f6b75c4c3fab946cd53a5ea0154ed8133db1909133a64e0c9696cb120af6bc7
-#+nawk.3d4adac0ba89766e0cafa44e623d55d4318d90e397bf76e0cf69011d7c059f07
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-modutils.f698dfbe59d0dd268802b88eff0b41314398b13f3a6d1e4253db78c7e1574a21
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+findutils.cdfc3f51aa3ba16c570868fa255761c70bf2eb952c4be03e84b8f0c760e07570
+#+diffutils.f4b7fa30ef951de0112469f276961b9e968b1d4e712eecb38a2ae62587d4d18c
+#+patch.6a227048016d19b54309e21e725a704d23707bb366d384df4cd30eaccaae3f55
+#+flex.0f73e9b8fa28dc3baf349d08527e0d33926692a897f6efe26519a4c9d901aad4
+#+bison.336db60a3e340b6f18968c281b378d99a16637d0f94c8e26de83882275b643bc
+#+rsync.d52f4b040894f801b7ef5bdf0020ca5148e3a381dfe5b8ab59986eae01385461
+#+zstd.1bfd81018a42b01b2b301cfc74c160e4137f03a31a0adeaa86a6569cc95b1717
+#+libelf.243e6634196a8f36df23d2c72661cdb74305df00fad85d6141ecfa5045589e55
+#+pkgconf-pkg-config.9aa3902fbb930df881f7e5402b8c784ef1672caccff791830d913246ee8fd5c9
+#+nawk.257a482c0dc30655341c73bf73ba2548fd6c9a85b1be5fddc14b0504a0534e86
 #@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,37 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+zsh.b2e3d0846aaa9fbaff883701998485f288f4cebfdcedabc88d3140162c6bc6b3
-#+pthbs-banginstall.a459b0c5dfd826f3cdbf00e997067dffc3d4f7ec54ff46e47567b1f2b276805d
-#+execline.98b288bf884e98dfd1774d38c3ce0cd767b1c122ae8582ce137ee9f7d325e67b
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+ccx-utils.ce34c3f8769025b772d7d1e8bb0ba77b525f890a862e2e050757593e3bbb2399
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+zsh.fcffbffcb0c0c3352f1cbfa0cc46559dfa56aa4095d5877892aa4b0e021fdc74
+#+pthbs-banginstall.576ac5077b84a6b4fe98be3f49056422e94f7f547287656cd09e8fce9ce3bd7d
+#+execline.2d9890704cb30e173554301ee68511361318af7395d96396d35c302e5dff922e
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+ccx-utils.c67eb9f7f7362065137149d680038c399d65e4c0f0f71a33e6325d9deb632d60
 #@git:409db79b3e7e5fc6b73305471d9bbb6ac5c14036:logincaps
 
 
diff --git a/variants/ccx-x86_64/m4 b/variants/ccx-x86_64/m4
@@ -1,35 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
 #@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:.
 
 
diff --git a/variants/ccx-x86_64/mandoc b/variants/ccx-x86_64/mandoc
@@ -1,35 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
 #@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.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+zsh.b2e3d0846aaa9fbaff883701998485f288f4cebfdcedabc88d3140162c6bc6b3
-#+pthbs-banginstall.a459b0c5dfd826f3cdbf00e997067dffc3d4f7ec54ff46e47567b1f2b276805d
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+zsh.fcffbffcb0c0c3352f1cbfa0cc46559dfa56aa4095d5877892aa4b0e021fdc74
+#+pthbs-banginstall.576ac5077b84a6b4fe98be3f49056422e94f7f547287656cd09e8fce9ce3bd7d
 #@git:395634340de8349996fd273b055ae4bac9d2897c:mdev-scripts
 
 
diff --git a/variants/ccx-x86_64/mdevd b/variants/ccx-x86_64/mdevd
@@ -1,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+skalibs.4c6bb8bcee00bd264a1cf26c17e36d7155f840f53128be18cdd5d1f00db157eb
-#+execline.98b288bf884e98dfd1774d38c3ce0cd767b1c122ae8582ce137ee9f7d325e67b
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+skalibs.04e057b8769ebec90f4eaa3993bed48a602f6bdf88a558bf173827bbbbd44392
+#+execline.2d9890704cb30e173554301ee68511361318af7395d96396d35c302e5dff922e
 #@git:96aef400b9f9d14f3bf54b0e444e9ad3665c4107:mdevd
 
 
@@ -47,7 +49,7 @@ cd 'mdevd'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.4c6bb8bcee00bd264a1cf26c17e36d7155f840f53128be18cdd5d1f00db157eb/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.04e057b8769ebec90f4eaa3993bed48a602f6bdf88a558bf173827bbbbd44392/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.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-dosfstools.983566a17821fcb32de0dddb7d6e785978c7273a96fc2351328089f9b600a4b9
-#+busybox-e2fsprogs.8f553a043e9d98e5e9d7268a166f7384a119d4819491a8839add7fc8ddb11892
-#+busybox-iproute2.81e4a1c96593d1bd624ee0bb11a204e0534c0b1cdc2c2e264a798f7569c52aca
-#+busybox-iputils.446fea1101fdfdf8b1b5af0ad5a4b2d2aa29adcaad812657ae48591fd224a396
-#+busybox-net-misc.ca6a84e212d8f555a0eac8637c83af010eca98db095db6f59171d35f91bc6935
-#+busybox-net-tools.f75ed05accc163299209dd375747e79e74e2d339373e6a80e6fe9373019cd6cb
-#+busybox-traceroute.1b0be7e3408d7589fa42d9e8f6a35cbb731297ed1c31e85ab87c9455d6b41068
-#+busybox-wget.b1eabcbee77e23b2340e1d3728d08f2565d5ec2a85ad485524f640b0cf69607e
-#+busybox-chpst.4b8ecfc8e205aee07b69f3e84d25b36637f765f53104f264f6f1c6fddda421e7
-#+busybox-console.8c83a1e67dcbd4ed580eadbbede4b0fec4f39ba77eb7a88f3c7113fca3b1a4f2
-#+busybox-getty.fc722cd28dddbc98d4991e91f764175fbe14d0636cf7e9e7d2f6149686ecb97e
-#+busybox-i2c-tools.48da2f9070109fcd7b1c6b437e5594c7331833411a67d74bece7751d8caba5e4
-#+busybox-linux-extra.8fec0ca34fa9ccc3eb472504473966830b1fa2c3c312a43f1d85867cea375fbc
-#+busybox-mtd-utils.1b7a0851def92f071f7230dc1e5b43d5b1cf7dc93de43d5392eaf97618fb90b9
-#+busybox-shadow.e05e541ad31c2afda4d355ab59727b2cf277e7047cfe312689a3d56bf3e2f593
-#+busybox-su.3151f0c0e0d3703fd8da9933b3fbe21bb51a78140d8caaa990e375f61c95d60e
-#+busybox-util-linux-priv.b38cb2fdda0edc168b3174cf7fc77eb101dcf56b6455d886fc931571120317ae
-#+busybox-logging.8282676a88f6e0bfc4a85146e7130c07749d58a5e9cc66d5e45ca8aa955f725f
-#+busybox-cron.dcf107e80707f311473e574da4dae533dc5944aa528156e7dfeedde136fad677
-#+execline.98b288bf884e98dfd1774d38c3ce0cd767b1c122ae8582ce137ee9f7d325e67b
-#+s6.8c7ff734f64e9c89d65907441f5ca6058d8e7eb56d19f44ec7bd9c1e1c9db4d9
-#+mdev-scripts.4e1335aa6ac62509df0b28cdd318ed573e9ff30fbaf57f53a695beb24d3aa8be
-#+mdevd.11651871fcf02c1e7564f18b16ede6717c1b41e0218727b5f954f6c22b8d461d
-#+busybox.892e0a7f8d598c92df2a50eeeaec5012295a610bc578da7c58f0d6fbd30eaf67-
\ No newline at end of file
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-dosfstools.bd9f2a329ddc9500a0b1d41767f0f4c80465d5d9af7f5d373666a51d35ae48ec
+#+busybox-e2fsprogs.2c541e5e1c8b7d2c147f6160d3ab92d89292a22b40fcf012c2ff1e709be394f4
+#+busybox-iproute2.a62d2e42193917f401c9a64e9fbbc97fc91e4a6064e886afa4210064cf1848d3
+#+busybox-iputils.71b6dbfef6b576a24160e102004c80aaf7837038bf42457b40215d38b80c9a5c
+#+busybox-net-misc.8f7dba414abce07473c2a3821086eb5147a2099a921d2365a81a3c16fa975fc2
+#+busybox-net-tools.cd08a41275209fb450e1a51c5d2c7de1abcdfe263190d0479e23d396fd0a61eb
+#+busybox-traceroute.c400683e9bf8d40f2d3b5236cac481e192fa0eaa6ab5dfabfbfffd365e8b8b50
+#+busybox-wget.79b50d20c9545dd941e0434bd64504d8369d24a4300304eeeb05ba3018affd5b
+#+busybox-chpst.955df8c837a844e1f1ffa117dedad7f202b85b3249be89901ccbcf28c5c7b805
+#+busybox-console.738d93ed50aee55c7f727fe85af0dbfad5897923e1c4ae0212538482d02009e6
+#+busybox-getty.86d09199ca03e869469ddca340377204d852bb2c1ea1b1712bf4276ce915641d
+#+busybox-i2c-tools.ba8892e9b938d0f9f26d6abf912400dd699bd9dd9ea5117be1c982d081f4b854
+#+busybox-linux-extra.ba3ab388d30aae158923323d139d36824359ef91e245dcd3c3d51d9dba00dae6
+#+busybox-mtd-utils.d4cfd607db2e0da3c1b9914aa67600440dc1dbdf57ed31a8f3ca95824d2607c7
+#+busybox-shadow.8ace403350ee33fa804385f4ae1c957ec0f4b26a031e23d74493a8bd96191e33
+#+busybox-su.b7030f31914b1f2d4e1c6d1f94ec207a51064374faffdd73962e64b955457983
+#+busybox-util-linux-priv.39d056aa0e75b5d17fb08a4b79898a4a8a9d3dbc05e4da8d98a963db36ba87ec
+#+busybox-logging.0f3cb2c5ebf2debb281e35c86d902094af5ba3be298cb32ae940fc0c53388d15
+#+busybox-cron.e7d9db51b1fbbd3961867e5c1eb18318223a7935da074f833636f3acb2db180f
+#+execline.2d9890704cb30e173554301ee68511361318af7395d96396d35c302e5dff922e
+#+s6.072c6be2de59334ae0f8fe3b95baa3fce42bf15b25d8d4c2162b68f794a1f19b
+#+mdev-scripts.9eb3540f59349f2f2e8e9941537f292f0d264c59c2e134f2d2c991fb25a2e0d3
+#+mdevd.1265568607a05bbece20d9a210b1531ac511fcc0bca46a00fa5afebe563198dd
+#+busybox.e49e298fec9b4216e00b954eca497cf2eb0809b2f23a2bc4956404b389b6bf1b+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/mlog b/variants/ccx-x86_64/mlog
@@ -1,34 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
 #@git:fefc95731f1260810a3551226b73d35f3d6e9d9e:mlog
 
 
diff --git a/variants/ccx-x86_64/musl-fts b/variants/ccx-x86_64/musl-fts
@@ -1,34 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
 #@untar:-z:sha256:49ae567a96dbab22823d045ffebe0d6b14b9b799925e9ca9274d47d26ff482a6:.
 
 
diff --git a/variants/ccx-x86_64/nawk b/variants/ccx-x86_64/nawk
@@ -1,35 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+bison.8af5e3d228dac6d59cb1010846136f9be107b4af139ab788ba8aad87195a98ff
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+bison.336db60a3e340b6f18968c281b378d99a16637d0f94c8e26de83882275b643bc
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
 #@untar:-z:sha256:e031b1e1d2b230f276f975bffb923f0ea15f798c839d15a3f26a1a39448e32d7:.
 
 
diff --git a/variants/ccx-x86_64/netbsd-curses b/variants/ccx-x86_64/netbsd-curses
@@ -1,34 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
 #@git:51d179dad861640caeb76674b5908ccd79f04fae:netbsd-curses
 
 
diff --git a/variants/ccx-x86_64/ocaml-astring b/variants/ccx-x86_64/ocaml-astring
@@ -1,39 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+ocaml.68b79e30d5d49e1998cb84f3738802255f84ee52504f41e8163bb20220e5a5b5
-#+ocaml-findlib.e0433283a39f50d3beba6742196da88132cdbbc9045c74cf8794915058c62a84
-#+ocamlbuild.322d748bf20b8ad3fb9bd0d1049bfb14dd9c17e9211c069b6e7b3b0dfd9d371d
-#+opam.2e647c70bf754204163ff1cea42eefb82021b6f88c90dd91a61a85e5fc9a0251
-#+ocaml-topkg.e3750c4db331f1a29a6777ef23aac672e1b45aeaa5c6f32d82003671b7f349be
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+ocaml.72417b373964682f23d84717f6ed50a8c0e1e625b0a3000deebee06c262e93f0
+#+ocaml-findlib.87317534846dc489f4ef4691560ff53a90e8f8a9c1b5227b515558d10d0f1770
+#+ocamlbuild.84b744d8d460674910fd29c6f7f6d08b3723349d7a8644840559d16acd6eb6ae
+#+opam.10d8f040d255e9078dd30847726fcf665b5881973d4db0daeb14b5af83959fa7
+#+ocaml-topkg.0cdcd3be7540ded10d00b8dda8d8f24a87b303bff4b53aa4ef13d0f0970e6a95
 #@untar:-j:sha256:865692630c07c3ab87c66cdfc2734c0fdfc9c34a57f8e89ffec7c7d15e7a70fa:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-base b/variants/ccx-x86_64/ocaml-base
@@ -1,38 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+ocaml.68b79e30d5d49e1998cb84f3738802255f84ee52504f41e8163bb20220e5a5b5
-#+dune.7914906ec655a6b13c1a52423f2f79540df30bd41a60de327ed787adef16b85f
-#+ocaml_intrinsics_kernel.e26d1e1228dbd2ab525e333a8983bcad4840d353630640cf3a8f79568f326814
-#+ocaml-sexplib0.9b1fffd89a190e234caf71fbf736b7089a0b3ed51e47be09eea9aba6a5d2cd72
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+ocaml.72417b373964682f23d84717f6ed50a8c0e1e625b0a3000deebee06c262e93f0
+#+dune.afbc2450081f994f9cbd5f0f614e078cb69e6170bd1d1ed86ce85e5062af461f
+#+ocaml_intrinsics_kernel.01371f143947dd4fa7df751f54dd880a27b2167c0a8e819d1fa0426b6820d5b3
+#+ocaml-sexplib0.307f43d9ce0c4ac4ac271cb577956709649e5be5ffd9c44763ec9b7baadefde1
 #@untar:-z:sha256:3f3f64789ab25bb5cb7f5f907dd651dec9cc9440981822fe75df6b94344b7208:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-bos b/variants/ccx-x86_64/ocaml-bos
@@ -1,45 +1,47 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+ocaml.68b79e30d5d49e1998cb84f3738802255f84ee52504f41e8163bb20220e5a5b5
-#+ocaml-findlib.e0433283a39f50d3beba6742196da88132cdbbc9045c74cf8794915058c62a84
-#+ocamlbuild.322d748bf20b8ad3fb9bd0d1049bfb14dd9c17e9211c069b6e7b3b0dfd9d371d
-#+opam.2e647c70bf754204163ff1cea42eefb82021b6f88c90dd91a61a85e5fc9a0251
-#+ocaml-topkg.e3750c4db331f1a29a6777ef23aac672e1b45aeaa5c6f32d82003671b7f349be
-#+ocaml-astring.bbb33a09aa6083b278aca8d35ad3ad30efe97a5542497e74034857a8f0fa524c
-#+ocaml-fpath.88b6afc12abbc7142a3df4a203e3c4dbf99ad69b03850e3a3f800b7645d24704
-#+ocaml-rresult.87c37380251619f50f640ad08f47146f6c0c29d938bc2790ee9dc049d6e953dd
-#+ocaml-fmt.fb0d12d4c8458cf589dc0a6f8aa5c5fd04fa7f779eddf38a39e6675c382f30c1
-#+ocaml-logs.4dee529f175717f97dfc0c1b798eb1c05b40793134f3481a0cf0be3abbc340b7
-#+ocaml-mtime.5687c3e63af8678c62d9374985fe42a043b7f76ab8bad657179d1713d86d7a70
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+ocaml.72417b373964682f23d84717f6ed50a8c0e1e625b0a3000deebee06c262e93f0
+#+ocaml-findlib.87317534846dc489f4ef4691560ff53a90e8f8a9c1b5227b515558d10d0f1770
+#+ocamlbuild.84b744d8d460674910fd29c6f7f6d08b3723349d7a8644840559d16acd6eb6ae
+#+opam.10d8f040d255e9078dd30847726fcf665b5881973d4db0daeb14b5af83959fa7
+#+ocaml-topkg.0cdcd3be7540ded10d00b8dda8d8f24a87b303bff4b53aa4ef13d0f0970e6a95
+#+ocaml-astring.735faf21dc46f34ffdf99f377f3dd8da7aa451d075804d1cdc88933d6e6d574a
+#+ocaml-fpath.e753364cfa6d5d0772a9f5b6b0bcb26238caf04a5cbf3d7e6e0e9903d5e52a18
+#+ocaml-rresult.170dd91ec77c7e590477523b2416dea250f24dc100763abbd242f7fc764255d9
+#+ocaml-fmt.d55e65637543470abefcc61aead756bd50f6167cb4c5b6f57c39f22f62385c39
+#+ocaml-logs.1466034864e94f6142b43f6f6f102ad95960b400500760d96cdab6013d3de203
+#+ocaml-mtime.23356434530a3bf8fcde4a7e5985034babcc91ec20310556d2622bb2f5f81572
 #@untar:-j:sha256:d8d62e786b10d697e0457205a8eedeaa27ebcc90f1855f18df190cac2e3d8f37:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-cmdliner b/variants/ccx-x86_64/ocaml-cmdliner
@@ -1,39 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+ocaml.68b79e30d5d49e1998cb84f3738802255f84ee52504f41e8163bb20220e5a5b5
-#+ocaml-findlib.e0433283a39f50d3beba6742196da88132cdbbc9045c74cf8794915058c62a84
-#+ocamlbuild.322d748bf20b8ad3fb9bd0d1049bfb14dd9c17e9211c069b6e7b3b0dfd9d371d
-#+opam.2e647c70bf754204163ff1cea42eefb82021b6f88c90dd91a61a85e5fc9a0251
-#+ocaml-topkg.e3750c4db331f1a29a6777ef23aac672e1b45aeaa5c6f32d82003671b7f349be
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+ocaml.72417b373964682f23d84717f6ed50a8c0e1e625b0a3000deebee06c262e93f0
+#+ocaml-findlib.87317534846dc489f4ef4691560ff53a90e8f8a9c1b5227b515558d10d0f1770
+#+ocamlbuild.84b744d8d460674910fd29c6f7f6d08b3723349d7a8644840559d16acd6eb6ae
+#+opam.10d8f040d255e9078dd30847726fcf665b5881973d4db0daeb14b5af83959fa7
+#+ocaml-topkg.0cdcd3be7540ded10d00b8dda8d8f24a87b303bff4b53aa4ef13d0f0970e6a95
 #@untar:-j:sha256:4e547a631c36fbaadff60d3bd7724eb3f83ba274e92fb725950bae7868378582:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-compiler-libs b/variants/ccx-x86_64/ocaml-compiler-libs
@@ -1,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+ocaml.68b79e30d5d49e1998cb84f3738802255f84ee52504f41e8163bb20220e5a5b5
-#+dune.7914906ec655a6b13c1a52423f2f79540df30bd41a60de327ed787adef16b85f
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+ocaml.72417b373964682f23d84717f6ed50a8c0e1e625b0a3000deebee06c262e93f0
+#+dune.afbc2450081f994f9cbd5f0f614e078cb69e6170bd1d1ed86ce85e5062af461f
 #@untar:-z:sha256:9b9644d7351db699e57ddba7c767bb4153e6e988ccf45ead2fb238a3bd75cdc7:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-cppo b/variants/ccx-x86_64/ocaml-cppo
@@ -1,37 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+ocaml.68b79e30d5d49e1998cb84f3738802255f84ee52504f41e8163bb20220e5a5b5
-#+dune.7914906ec655a6b13c1a52423f2f79540df30bd41a60de327ed787adef16b85f
-#+ocamlbuild.322d748bf20b8ad3fb9bd0d1049bfb14dd9c17e9211c069b6e7b3b0dfd9d371d
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+ocaml.72417b373964682f23d84717f6ed50a8c0e1e625b0a3000deebee06c262e93f0
+#+dune.afbc2450081f994f9cbd5f0f614e078cb69e6170bd1d1ed86ce85e5062af461f
+#+ocamlbuild.84b744d8d460674910fd29c6f7f6d08b3723349d7a8644840559d16acd6eb6ae
 #@untar:-z:sha256:6e62a8ee0217c9cc38d5860110eb18eb8d89c05c420353d298e1431fe8bac00f:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-findlib b/variants/ccx-x86_64/ocaml-findlib
@@ -1,39 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+m4.6f7bd3298835d0609008d0fbdb57c9ba9867d8710ad92c1fbdc644f1f6e0ac73
-#+netbsd-curses.c2581cd57eb0726b500316784644e52b05ed360c1b4c1133931ef961b7ccb7c4
-#+ocaml.68b79e30d5d49e1998cb84f3738802255f84ee52504f41e8163bb20220e5a5b5
-#+ocamlbuild.322d748bf20b8ad3fb9bd0d1049bfb14dd9c17e9211c069b6e7b3b0dfd9d371d
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+m4.30d10cc3eee1114a0e9c629a357a10cc0b9acc4d5eff1c594d6ed9a1db30462f
+#+netbsd-curses.5efddf0df412526b83495d64c666b885ff426ca073bc06187a0122c8e5f0abde
+#+ocaml.72417b373964682f23d84717f6ed50a8c0e1e625b0a3000deebee06c262e93f0
+#+ocamlbuild.84b744d8d460674910fd29c6f7f6d08b3723349d7a8644840559d16acd6eb6ae
 #@untar:-z:sha256:662c910f774e9fee3a19c4e057f380581ab2fc4ee52da4761304ac9c31b8869d:.
 
 
@@ -53,7 +55,7 @@ check_dynamic() {
 			printf '%s\n' "Error: '$1' is not a dynamic binary!"
 			exit 1
 			;;
-		(*'/home/ccx/versions/musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/home/ccx/versions/musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
 			return 0
 			;;
 		(*)
@@ -79,7 +81,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.68b79e30d5d49e1998cb84f3738802255f84ee52504f41e8163bb20220e5a5b5"
+stdlib="$pthbs_destdir/home/ccx/versions/ocaml.72417b373964682f23d84717f6ed50a8c0e1e625b0a3000deebee06c262e93f0"
 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,40 +1,42 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+ocaml.68b79e30d5d49e1998cb84f3738802255f84ee52504f41e8163bb20220e5a5b5
-#+ocaml-findlib.e0433283a39f50d3beba6742196da88132cdbbc9045c74cf8794915058c62a84
-#+ocamlbuild.322d748bf20b8ad3fb9bd0d1049bfb14dd9c17e9211c069b6e7b3b0dfd9d371d
-#+opam.2e647c70bf754204163ff1cea42eefb82021b6f88c90dd91a61a85e5fc9a0251
-#+ocaml-topkg.e3750c4db331f1a29a6777ef23aac672e1b45aeaa5c6f32d82003671b7f349be
-#+ocaml-cmdliner.9c770f4aee8ceb19954db32899391364f9ecdb92d87ee9b9c88e77f1c16680e1
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+ocaml.72417b373964682f23d84717f6ed50a8c0e1e625b0a3000deebee06c262e93f0
+#+ocaml-findlib.87317534846dc489f4ef4691560ff53a90e8f8a9c1b5227b515558d10d0f1770
+#+ocamlbuild.84b744d8d460674910fd29c6f7f6d08b3723349d7a8644840559d16acd6eb6ae
+#+opam.10d8f040d255e9078dd30847726fcf665b5881973d4db0daeb14b5af83959fa7
+#+ocaml-topkg.0cdcd3be7540ded10d00b8dda8d8f24a87b303bff4b53aa4ef13d0f0970e6a95
+#+ocaml-cmdliner.e9f92b8b179e953b3293995338dad40ba0d4f071756b2bc2386c9475e8339cce
 #@untar:-j:sha256:857cfd47a54b52429cd9b3e2665e44173cd1bd3b435bece7172f984ad5376a1b:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-fpath b/variants/ccx-x86_64/ocaml-fpath
@@ -1,40 +1,42 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+ocaml.68b79e30d5d49e1998cb84f3738802255f84ee52504f41e8163bb20220e5a5b5
-#+ocaml-findlib.e0433283a39f50d3beba6742196da88132cdbbc9045c74cf8794915058c62a84
-#+ocamlbuild.322d748bf20b8ad3fb9bd0d1049bfb14dd9c17e9211c069b6e7b3b0dfd9d371d
-#+opam.2e647c70bf754204163ff1cea42eefb82021b6f88c90dd91a61a85e5fc9a0251
-#+ocaml-topkg.e3750c4db331f1a29a6777ef23aac672e1b45aeaa5c6f32d82003671b7f349be
-#+ocaml-astring.bbb33a09aa6083b278aca8d35ad3ad30efe97a5542497e74034857a8f0fa524c
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+ocaml.72417b373964682f23d84717f6ed50a8c0e1e625b0a3000deebee06c262e93f0
+#+ocaml-findlib.87317534846dc489f4ef4691560ff53a90e8f8a9c1b5227b515558d10d0f1770
+#+ocamlbuild.84b744d8d460674910fd29c6f7f6d08b3723349d7a8644840559d16acd6eb6ae
+#+opam.10d8f040d255e9078dd30847726fcf665b5881973d4db0daeb14b5af83959fa7
+#+ocaml-topkg.0cdcd3be7540ded10d00b8dda8d8f24a87b303bff4b53aa4ef13d0f0970e6a95
+#+ocaml-astring.735faf21dc46f34ffdf99f377f3dd8da7aa451d075804d1cdc88933d6e6d574a
 #@untar:-j:sha256:12b08ff192d037d9b6d69e9ca19d1d385184f20b3237c27231e437ac81ace70f:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-logs b/variants/ccx-x86_64/ocaml-logs
@@ -1,42 +1,44 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+ocaml.68b79e30d5d49e1998cb84f3738802255f84ee52504f41e8163bb20220e5a5b5
-#+ocaml-findlib.e0433283a39f50d3beba6742196da88132cdbbc9045c74cf8794915058c62a84
-#+ocamlbuild.322d748bf20b8ad3fb9bd0d1049bfb14dd9c17e9211c069b6e7b3b0dfd9d371d
-#+opam.2e647c70bf754204163ff1cea42eefb82021b6f88c90dd91a61a85e5fc9a0251
-#+ocaml-topkg.e3750c4db331f1a29a6777ef23aac672e1b45aeaa5c6f32d82003671b7f349be
-#+ocaml-mtime.5687c3e63af8678c62d9374985fe42a043b7f76ab8bad657179d1713d86d7a70
-#+ocaml-cmdliner.9c770f4aee8ceb19954db32899391364f9ecdb92d87ee9b9c88e77f1c16680e1
-#+ocaml-fmt.fb0d12d4c8458cf589dc0a6f8aa5c5fd04fa7f779eddf38a39e6675c382f30c1
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+ocaml.72417b373964682f23d84717f6ed50a8c0e1e625b0a3000deebee06c262e93f0
+#+ocaml-findlib.87317534846dc489f4ef4691560ff53a90e8f8a9c1b5227b515558d10d0f1770
+#+ocamlbuild.84b744d8d460674910fd29c6f7f6d08b3723349d7a8644840559d16acd6eb6ae
+#+opam.10d8f040d255e9078dd30847726fcf665b5881973d4db0daeb14b5af83959fa7
+#+ocaml-topkg.0cdcd3be7540ded10d00b8dda8d8f24a87b303bff4b53aa4ef13d0f0970e6a95
+#+ocaml-mtime.23356434530a3bf8fcde4a7e5985034babcc91ec20310556d2622bb2f5f81572
+#+ocaml-cmdliner.e9f92b8b179e953b3293995338dad40ba0d4f071756b2bc2386c9475e8339cce
+#+ocaml-fmt.d55e65637543470abefcc61aead756bd50f6167cb4c5b6f57c39f22f62385c39
 #@untar:-j:sha256:ee97065ba41ce28f19dea9453c6bec4e0ef26165ad7394c4131ea0c65c0f06d5:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-lun b/variants/ccx-x86_64/ocaml-lun
@@ -1,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+ocaml.68b79e30d5d49e1998cb84f3738802255f84ee52504f41e8163bb20220e5a5b5
-#+dune.7914906ec655a6b13c1a52423f2f79540df30bd41a60de327ed787adef16b85f
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+ocaml.72417b373964682f23d84717f6ed50a8c0e1e625b0a3000deebee06c262e93f0
+#+dune.afbc2450081f994f9cbd5f0f614e078cb69e6170bd1d1ed86ce85e5062af461f
 #@untar:-j:sha256:cca8badff83b470fdcfb1840116f8e8a6f2cb86cde2f44ed28cf26cbf692a793:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-mtime b/variants/ccx-x86_64/ocaml-mtime
@@ -1,39 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+ocaml.68b79e30d5d49e1998cb84f3738802255f84ee52504f41e8163bb20220e5a5b5
-#+ocaml-findlib.e0433283a39f50d3beba6742196da88132cdbbc9045c74cf8794915058c62a84
-#+ocamlbuild.322d748bf20b8ad3fb9bd0d1049bfb14dd9c17e9211c069b6e7b3b0dfd9d371d
-#+opam.2e647c70bf754204163ff1cea42eefb82021b6f88c90dd91a61a85e5fc9a0251
-#+ocaml-topkg.e3750c4db331f1a29a6777ef23aac672e1b45aeaa5c6f32d82003671b7f349be
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+ocaml.72417b373964682f23d84717f6ed50a8c0e1e625b0a3000deebee06c262e93f0
+#+ocaml-findlib.87317534846dc489f4ef4691560ff53a90e8f8a9c1b5227b515558d10d0f1770
+#+ocamlbuild.84b744d8d460674910fd29c6f7f6d08b3723349d7a8644840559d16acd6eb6ae
+#+opam.10d8f040d255e9078dd30847726fcf665b5881973d4db0daeb14b5af83959fa7
+#+ocaml-topkg.0cdcd3be7540ded10d00b8dda8d8f24a87b303bff4b53aa4ef13d0f0970e6a95
 #@untar:-j:sha256:097cb2802e3701ead9572e1b483d5a28c6e2f0a39449faaf9b44ad8a89834d88:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-ppx_derivers b/variants/ccx-x86_64/ocaml-ppx_derivers
@@ -1,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+ocaml.68b79e30d5d49e1998cb84f3738802255f84ee52504f41e8163bb20220e5a5b5
-#+dune.7914906ec655a6b13c1a52423f2f79540df30bd41a60de327ed787adef16b85f
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+ocaml.72417b373964682f23d84717f6ed50a8c0e1e625b0a3000deebee06c262e93f0
+#+dune.afbc2450081f994f9cbd5f0f614e078cb69e6170bd1d1ed86ce85e5062af461f
 #@untar:-z:sha256:b6595ee187dea792b31fc54a0e1524ab1e48bc6068d3066c45215a138cc73b95:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-ppx_deriving b/variants/ccx-x86_64/ocaml-ppx_deriving
@@ -1,43 +1,45 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+ocaml.68b79e30d5d49e1998cb84f3738802255f84ee52504f41e8163bb20220e5a5b5
-#+dune.7914906ec655a6b13c1a52423f2f79540df30bd41a60de327ed787adef16b85f
-#+ocaml-compiler-libs.25c703289857f28569f9348f30c3058194c734233e921846abacb40f20a6094f
-#+ocaml-cppo.39ddc66523465b24b713f9c0727264cee2af92f2d3bd9c1e7c1e743540d3e758
-#+ocaml-findlib.e0433283a39f50d3beba6742196da88132cdbbc9045c74cf8794915058c62a84
-#+ocaml-ppx_derivers.58815e2e5724bbc3b9ed7dc4cfd82820b2a794ba3125115ada5a421ca033c757
-#+ocaml-ppxlib.c29b4a5bc0cb44c3d4d7f3494d87b5afe51df3547d18639213bc21aa65f4378c
-#+ocaml-sexplib0.9b1fffd89a190e234caf71fbf736b7089a0b3ed51e47be09eea9aba6a5d2cd72
-#+ocaml-stdlib-shims.8024068f8f4712f45af3303bb39927716863e5c8997291109cc88df72f9ab25c
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+ocaml.72417b373964682f23d84717f6ed50a8c0e1e625b0a3000deebee06c262e93f0
+#+dune.afbc2450081f994f9cbd5f0f614e078cb69e6170bd1d1ed86ce85e5062af461f
+#+ocaml-compiler-libs.d6b29a58910c4ee25b879c12c0917c6e460a1a99425c2437ac9bb07d3245bee8
+#+ocaml-cppo.bbe796a5a8d2cb9a11f75b63d1cfc112882272e9324c0ffa8e4b4d65b4403399
+#+ocaml-findlib.87317534846dc489f4ef4691560ff53a90e8f8a9c1b5227b515558d10d0f1770
+#+ocaml-ppx_derivers.b01ed564f7adcb6ee459590600552e181787c812f62c952d938b63d102ae34de
+#+ocaml-ppxlib.5bb452a57a93b5abf2bba584d8745ef160af40b49f3df2d09212691127ecfee8
+#+ocaml-sexplib0.307f43d9ce0c4ac4ac271cb577956709649e5be5ffd9c44763ec9b7baadefde1
+#+ocaml-stdlib-shims.6ccfb6362a11168d34395d1cd00368bec5bf1bdb9b5fca630daa292bd4eb3a26
 #@untar:-z:sha256:c91d1ea5e15e6928a2f8947dbd135b9f765cc0e2d72be271427981afcd350c24:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-ppxlib b/variants/ccx-x86_64/ocaml-ppxlib
@@ -1,40 +1,42 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+ocaml.68b79e30d5d49e1998cb84f3738802255f84ee52504f41e8163bb20220e5a5b5
-#+dune.7914906ec655a6b13c1a52423f2f79540df30bd41a60de327ed787adef16b85f
-#+ocaml-compiler-libs.25c703289857f28569f9348f30c3058194c734233e921846abacb40f20a6094f
-#+ocaml-ppx_derivers.58815e2e5724bbc3b9ed7dc4cfd82820b2a794ba3125115ada5a421ca033c757
-#+ocaml-sexplib0.9b1fffd89a190e234caf71fbf736b7089a0b3ed51e47be09eea9aba6a5d2cd72
-#+ocaml-stdlib-shims.8024068f8f4712f45af3303bb39927716863e5c8997291109cc88df72f9ab25c
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+ocaml.72417b373964682f23d84717f6ed50a8c0e1e625b0a3000deebee06c262e93f0
+#+dune.afbc2450081f994f9cbd5f0f614e078cb69e6170bd1d1ed86ce85e5062af461f
+#+ocaml-compiler-libs.d6b29a58910c4ee25b879c12c0917c6e460a1a99425c2437ac9bb07d3245bee8
+#+ocaml-ppx_derivers.b01ed564f7adcb6ee459590600552e181787c812f62c952d938b63d102ae34de
+#+ocaml-sexplib0.307f43d9ce0c4ac4ac271cb577956709649e5be5ffd9c44763ec9b7baadefde1
+#+ocaml-stdlib-shims.6ccfb6362a11168d34395d1cd00368bec5bf1bdb9b5fca630daa292bd4eb3a26
 #@untar:-j:sha256:2e223837e7cecc3bc84a432432c0a72f4e1d5be9165c9c33772f156db85db0b3:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-rresult b/variants/ccx-x86_64/ocaml-rresult
@@ -1,39 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+ocaml.68b79e30d5d49e1998cb84f3738802255f84ee52504f41e8163bb20220e5a5b5
-#+ocaml-findlib.e0433283a39f50d3beba6742196da88132cdbbc9045c74cf8794915058c62a84
-#+ocamlbuild.322d748bf20b8ad3fb9bd0d1049bfb14dd9c17e9211c069b6e7b3b0dfd9d371d
-#+opam.2e647c70bf754204163ff1cea42eefb82021b6f88c90dd91a61a85e5fc9a0251
-#+ocaml-topkg.e3750c4db331f1a29a6777ef23aac672e1b45aeaa5c6f32d82003671b7f349be
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+ocaml.72417b373964682f23d84717f6ed50a8c0e1e625b0a3000deebee06c262e93f0
+#+ocaml-findlib.87317534846dc489f4ef4691560ff53a90e8f8a9c1b5227b515558d10d0f1770
+#+ocamlbuild.84b744d8d460674910fd29c6f7f6d08b3723349d7a8644840559d16acd6eb6ae
+#+opam.10d8f040d255e9078dd30847726fcf665b5881973d4db0daeb14b5af83959fa7
+#+ocaml-topkg.0cdcd3be7540ded10d00b8dda8d8f24a87b303bff4b53aa4ef13d0f0970e6a95
 #@untar:-j:sha256:11aa7f5b83460e60431e3154e3e32c071d46e151ea5760cf24377805bf975540:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-sexplib0 b/variants/ccx-x86_64/ocaml-sexplib0
@@ -1,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+ocaml.68b79e30d5d49e1998cb84f3738802255f84ee52504f41e8163bb20220e5a5b5
-#+dune.7914906ec655a6b13c1a52423f2f79540df30bd41a60de327ed787adef16b85f
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+ocaml.72417b373964682f23d84717f6ed50a8c0e1e625b0a3000deebee06c262e93f0
+#+dune.afbc2450081f994f9cbd5f0f614e078cb69e6170bd1d1ed86ce85e5062af461f
 #@untar:-z:sha256:86dba26468194512f789f2fb709063515a9cb4e5c4461c021c239a369590701d:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-stdlib-shims b/variants/ccx-x86_64/ocaml-stdlib-shims
@@ -1,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+ocaml.68b79e30d5d49e1998cb84f3738802255f84ee52504f41e8163bb20220e5a5b5
-#+dune.7914906ec655a6b13c1a52423f2f79540df30bd41a60de327ed787adef16b85f
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+ocaml.72417b373964682f23d84717f6ed50a8c0e1e625b0a3000deebee06c262e93f0
+#+dune.afbc2450081f994f9cbd5f0f614e078cb69e6170bd1d1ed86ce85e5062af461f
 #@untar:-j:sha256:babf72d3917b86f707885f0c5528e36c63fccb698f4b46cf2bab5c7ccdd6d84a:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-topkg b/variants/ccx-x86_64/ocaml-topkg
@@ -1,38 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+ocaml.68b79e30d5d49e1998cb84f3738802255f84ee52504f41e8163bb20220e5a5b5
-#+ocaml-findlib.e0433283a39f50d3beba6742196da88132cdbbc9045c74cf8794915058c62a84
-#+ocamlbuild.322d748bf20b8ad3fb9bd0d1049bfb14dd9c17e9211c069b6e7b3b0dfd9d371d
-#+opam.2e647c70bf754204163ff1cea42eefb82021b6f88c90dd91a61a85e5fc9a0251
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+ocaml.72417b373964682f23d84717f6ed50a8c0e1e625b0a3000deebee06c262e93f0
+#+ocaml-findlib.87317534846dc489f4ef4691560ff53a90e8f8a9c1b5227b515558d10d0f1770
+#+ocamlbuild.84b744d8d460674910fd29c6f7f6d08b3723349d7a8644840559d16acd6eb6ae
+#+opam.10d8f040d255e9078dd30847726fcf665b5881973d4db0daeb14b5af83959fa7
 #@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.68b79e30d5d49e1998cb84f3738802255f84ee52504f41e8163bb20220e5a5b5
-#+dune.7914906ec655a6b13c1a52423f2f79540df30bd41a60de327ed787adef16b85f
-#+ocamlbuild.322d748bf20b8ad3fb9bd0d1049bfb14dd9c17e9211c069b6e7b3b0dfd9d371d
-#+ocaml-base.ed3c8e0e6f49e85769f52cee03a1f2f6f7c856a91e204147b28d0116b52cda46
-#+opam.2e647c70bf754204163ff1cea42eefb82021b6f88c90dd91a61a85e5fc9a0251
-#+ocaml-bos.2144c5785e8dfada3781a49e8343994c47c1273279b3f76a0efcf8eedad15485
-#+ocaml-lun.81f9d1cbe98661d0cad71cc7a4d5b9719964ad4544a35403160e6f0f41fc38e2
-#+ocaml-ppx_deriving.7ba57906b71cf6d9ba8167e617685c5312750a15dc8ae7fe0ad51c87e8e628aa-
\ No newline at end of file
+#+ocaml.72417b373964682f23d84717f6ed50a8c0e1e625b0a3000deebee06c262e93f0
+#+dune.afbc2450081f994f9cbd5f0f614e078cb69e6170bd1d1ed86ce85e5062af461f
+#+ocamlbuild.84b744d8d460674910fd29c6f7f6d08b3723349d7a8644840559d16acd6eb6ae
+#+ocaml-base.d71db8bb4efa67adfec5766967a2d977d384829ddd256e3087eafb22c2d70084
+#+opam.10d8f040d255e9078dd30847726fcf665b5881973d4db0daeb14b5af83959fa7
+#+ocaml-bos.7e3718921d32c06dbabebf4ea5b02bd628a201d8b423e5dc3a9f4b1150ff236a
+#+ocaml-lun.8de4b5b6dab7e953631a2e593ee4e1f211d505eef66f396f04042cf6676805ec
+#+ocaml-ppx_deriving.881e60ae92568269e7a597563f01693bf2c021888c61c505d1c0c38c75b6632f+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/ocaml:dynlink b/variants/ccx-x86_64/ocaml:dynlink
@@ -1,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+m4.6f7bd3298835d0609008d0fbdb57c9ba9867d8710ad92c1fbdc644f1f6e0ac73
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+m4.30d10cc3eee1114a0e9c629a357a10cc0b9acc4d5eff1c594d6ed9a1db30462f
 #@untar:-J:sha256:dfaa8a2e11c799bc1765d8bef44911406ee5f4803027190382a939f88c912266:.
 
 
diff --git a/variants/ccx-x86_64/ocaml_intrinsics_kernel b/variants/ccx-x86_64/ocaml_intrinsics_kernel
@@ -1,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+ocaml.68b79e30d5d49e1998cb84f3738802255f84ee52504f41e8163bb20220e5a5b5
-#+dune.7914906ec655a6b13c1a52423f2f79540df30bd41a60de327ed787adef16b85f
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+ocaml.72417b373964682f23d84717f6ed50a8c0e1e625b0a3000deebee06c262e93f0
+#+dune.afbc2450081f994f9cbd5f0f614e078cb69e6170bd1d1ed86ce85e5062af461f
 #@untar:-z:sha256:c988b7769a59749631c3c98ba5edd1d2fe91f5dc380b5e0593c073c92f4bee01:.
 
 
diff --git a/variants/ccx-x86_64/ocamlbuild b/variants/ccx-x86_64/ocamlbuild
@@ -1,37 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+m4.6f7bd3298835d0609008d0fbdb57c9ba9867d8710ad92c1fbdc644f1f6e0ac73
-#+ocaml.68b79e30d5d49e1998cb84f3738802255f84ee52504f41e8163bb20220e5a5b5
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+m4.30d10cc3eee1114a0e9c629a357a10cc0b9acc4d5eff1c594d6ed9a1db30462f
+#+ocaml.72417b373964682f23d84717f6ed50a8c0e1e625b0a3000deebee06c262e93f0
 #@untar:-z:sha256:2ba6857f2991b7f69368e8db818b163d31cf5a367f15f5953bf8f01a77b3d4fc:.
 
 
@@ -51,7 +53,7 @@ check_dynamic() {
 			printf '%s\n' "Error: '$1' is not a dynamic binary!"
 			exit 1
 			;;
-		(*'/home/ccx/versions/musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/home/ccx/versions/musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
 			return 0
 			;;
 		(*)
@@ -75,7 +77,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.68b79e30d5d49e1998cb84f3738802255f84ee52504f41e8163bb20220e5a5b5"
+stdlib="$pthbs_destdir/home/ccx/versions/ocaml.72417b373964682f23d84717f6ed50a8c0e1e625b0a3000deebee06c262e93f0"
 mkdir -p "${stdlib%/*}"
 ln -s "$pthbs_package" "$stdlib"
 
diff --git a/variants/ccx-x86_64/opam b/variants/ccx-x86_64/opam
@@ -1,39 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+diffutils.2b09d2d83c94d2c37771fd4f753e86e8353ee88125c07a6230c6c0d219dc1bff
-#+patch.141394d3463b9153bdd6b421d8f10b79dd1c458eafb2244bd9af5d7638e67a08
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+getconf.9e5df47fc7bfe1a480fab7b42a834c583d6ecd6f9c0528feef768451c8296246
-#+ocaml.68b79e30d5d49e1998cb84f3738802255f84ee52504f41e8163bb20220e5a5b5
-#+dune.7914906ec655a6b13c1a52423f2f79540df30bd41a60de327ed787adef16b85f
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+diffutils.f4b7fa30ef951de0112469f276961b9e968b1d4e712eecb38a2ae62587d4d18c
+#+patch.6a227048016d19b54309e21e725a704d23707bb366d384df4cd30eaccaae3f55
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+getconf.efbf676fd1b52e044fb94a9fc87dd6609c5d3dd77330c5bba57fefbc54bdd5cc
+#+ocaml.72417b373964682f23d84717f6ed50a8c0e1e625b0a3000deebee06c262e93f0
+#+dune.afbc2450081f994f9cbd5f0f614e078cb69e6170bd1d1ed86ce85e5062af461f
 #@untar:-z:sha256:c4d053029793c714e4e7340b1157428c0f90783585fb17f35158247a640467d9:.
 
 
@@ -72,7 +74,7 @@ export DUNE_CACHE=disabled
 	--infodir="$prefix/info" \
 	--localedir="$prefix/locale" \
 	--localstatedir='/var/pthbs' \
-	--with-dune='/home/ccx/versions/dune.7914906ec655a6b13c1a52423f2f79540df30bd41a60de327ed787adef16b85f/command/dune' \
+	--with-dune='/home/ccx/versions/dune.afbc2450081f994f9cbd5f0f614e078cb69e6170bd1d1ed86ce85e5062af461f/command/dune' \
 	--with-mccs \
 	--with-vendored-deps \
 	--enable-static
diff --git a/variants/ccx-x86_64/patch b/variants/ccx-x86_64/patch
@@ -1,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+m4.6f7bd3298835d0609008d0fbdb57c9ba9867d8710ad92c1fbdc644f1f6e0ac73
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+m4.30d10cc3eee1114a0e9c629a357a10cc0b9acc4d5eff1c594d6ed9a1db30462f
 #@untar:-J:sha256:ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd:.
 
 
diff --git a/variants/ccx-x86_64/pkgconf b/variants/ccx-x86_64/pkgconf
@@ -1,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+m4.6f7bd3298835d0609008d0fbdb57c9ba9867d8710ad92c1fbdc644f1f6e0ac73
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+m4.30d10cc3eee1114a0e9c629a357a10cc0b9acc4d5eff1c594d6ed9a1db30462f
 #@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.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+pkgconf.7b7251f9cbbf00b5d20332fe41f895d068e859da9cb2c72270f70a537e8aa601
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+pkgconf.ff46b3bed800aecc8ed57a57bb2e5c32e1a9b81aa2cbf77ba05f345af5b318ff
 
 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,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+m4.6f7bd3298835d0609008d0fbdb57c9ba9867d8710ad92c1fbdc644f1f6e0ac73
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+m4.30d10cc3eee1114a0e9c629a357a10cc0b9acc4d5eff1c594d6ed9a1db30462f
 #@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.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+zsh.b2e3d0846aaa9fbaff883701998485f288f4cebfdcedabc88d3140162c6bc6b3
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+zsh.fcffbffcb0c0c3352f1cbfa0cc46559dfa56aa4095d5877892aa4b0e021fdc74
 #@sha256:1e021bddaf5c020ede9107656494715236a894557b99035365fc999605541b2d:pthbs-banginstall
 
 
diff --git a/variants/ccx-x86_64/rsync b/variants/ccx-x86_64/rsync
@@ -1,39 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+m4.6f7bd3298835d0609008d0fbdb57c9ba9867d8710ad92c1fbdc644f1f6e0ac73
-#+nawk.3d4adac0ba89766e0cafa44e623d55d4318d90e397bf76e0cf69011d7c059f07
-#+popt.57c8f2186cd6a2b1286ab826601095fcea6a4af098e1904ad69b53e55a4046a3
-#+libressl.0e2a2d650925ed59678ae580bd35afecdf5b3b5704b1d86d990ad3ff223dcb84
-#+zstd.c1107c320609d03324f44b811645887857b5858b8b443e1892459697d08d6f6c
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+m4.30d10cc3eee1114a0e9c629a357a10cc0b9acc4d5eff1c594d6ed9a1db30462f
+#+nawk.257a482c0dc30655341c73bf73ba2548fd6c9a85b1be5fddc14b0504a0534e86
+#+popt.b675f3a52450d42ef2b71febcac95deaedb3374e538a20c96f4d5ecb3634cbeb
+#+libressl.149d83ff736e1ca773a90e36086cd74e89942d184091ed5ac7a6470bcf6c3ef5
+#+zstd.1bfd81018a42b01b2b301cfc74c160e4137f03a31a0adeaa86a6569cc95b1717
 #@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:.
 
 
diff --git a/variants/ccx-x86_64/s6 b/variants/ccx-x86_64/s6
@@ -1,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+skalibs.4c6bb8bcee00bd264a1cf26c17e36d7155f840f53128be18cdd5d1f00db157eb
-#+execline.98b288bf884e98dfd1774d38c3ce0cd767b1c122ae8582ce137ee9f7d325e67b
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+skalibs.04e057b8769ebec90f4eaa3993bed48a602f6bdf88a558bf173827bbbbd44392
+#+execline.2d9890704cb30e173554301ee68511361318af7395d96396d35c302e5dff922e
 #@git:0e02fe0e92b8f9a619fc355babad2c78c009c1f1:s6
 
 
@@ -47,7 +49,7 @@ cd 's6'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.4c6bb8bcee00bd264a1cf26c17e36d7155f840f53128be18cdd5d1f00db157eb/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.04e057b8769ebec90f4eaa3993bed48a602f6bdf88a558bf173827bbbbd44392/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,35 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+skalibs.4c6bb8bcee00bd264a1cf26c17e36d7155f840f53128be18cdd5d1f00db157eb
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+skalibs.04e057b8769ebec90f4eaa3993bed48a602f6bdf88a558bf173827bbbbd44392
 #@git:dc80225c0a78346300d100f0bf0182ed338c4b01:s6-dns
 
 
@@ -46,7 +48,7 @@ cd 's6-dns'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.4c6bb8bcee00bd264a1cf26c17e36d7155f840f53128be18cdd5d1f00db157eb/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.04e057b8769ebec90f4eaa3993bed48a602f6bdf88a558bf173827bbbbd44392/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,37 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+skalibs.4c6bb8bcee00bd264a1cf26c17e36d7155f840f53128be18cdd5d1f00db157eb
-#+execline.98b288bf884e98dfd1774d38c3ce0cd767b1c122ae8582ce137ee9f7d325e67b
-#+s6.8c7ff734f64e9c89d65907441f5ca6058d8e7eb56d19f44ec7bd9c1e1c9db4d9
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+skalibs.04e057b8769ebec90f4eaa3993bed48a602f6bdf88a558bf173827bbbbd44392
+#+execline.2d9890704cb30e173554301ee68511361318af7395d96396d35c302e5dff922e
+#+s6.072c6be2de59334ae0f8fe3b95baa3fce42bf15b25d8d4c2162b68f794a1f19b
 #@git:b298e515efe16210048e504e3aec89ea1e627b73:s6-linux-init
 
 
@@ -48,7 +50,7 @@ cd 's6-linux-init'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.4c6bb8bcee00bd264a1cf26c17e36d7155f840f53128be18cdd5d1f00db157eb/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.04e057b8769ebec90f4eaa3993bed48a602f6bdf88a558bf173827bbbbd44392/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,35 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+skalibs.4c6bb8bcee00bd264a1cf26c17e36d7155f840f53128be18cdd5d1f00db157eb
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+skalibs.04e057b8769ebec90f4eaa3993bed48a602f6bdf88a558bf173827bbbbd44392
 #@git:a9e7acac41a8854546246dd39cb4daee54ead2cb:s6-linux-utils
 
 
@@ -46,7 +48,7 @@ cd 's6-linux-utils'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.4c6bb8bcee00bd264a1cf26c17e36d7155f840f53128be18cdd5d1f00db157eb/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.04e057b8769ebec90f4eaa3993bed48a602f6bdf88a558bf173827bbbbd44392/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,39 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+skalibs.4c6bb8bcee00bd264a1cf26c17e36d7155f840f53128be18cdd5d1f00db157eb
-#+execline.98b288bf884e98dfd1774d38c3ce0cd767b1c122ae8582ce137ee9f7d325e67b
-#+s6.8c7ff734f64e9c89d65907441f5ca6058d8e7eb56d19f44ec7bd9c1e1c9db4d9
-#+s6-dns.d0406727680d045dcd4881e79b9594a95f48972e0ccaaddf71c5f045fd2b8075
-#+libressl.0e2a2d650925ed59678ae580bd35afecdf5b3b5704b1d86d990ad3ff223dcb84
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+skalibs.04e057b8769ebec90f4eaa3993bed48a602f6bdf88a558bf173827bbbbd44392
+#+execline.2d9890704cb30e173554301ee68511361318af7395d96396d35c302e5dff922e
+#+s6.072c6be2de59334ae0f8fe3b95baa3fce42bf15b25d8d4c2162b68f794a1f19b
+#+s6-dns.b5c5ba9bee67c7c21488e97008762d870857651f32018adcce746fc884e2e817
+#+libressl.149d83ff736e1ca773a90e36086cd74e89942d184091ed5ac7a6470bcf6c3ef5
 #@git:12b40106ed1727274cd6af379c4ba0ca7161700b:s6-networking
 
 
@@ -50,7 +52,7 @@ cd 's6-networking'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.4c6bb8bcee00bd264a1cf26c17e36d7155f840f53128be18cdd5d1f00db157eb/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.04e057b8769ebec90f4eaa3993bed48a602f6bdf88a558bf173827bbbbd44392/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,35 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+skalibs.4c6bb8bcee00bd264a1cf26c17e36d7155f840f53128be18cdd5d1f00db157eb
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+skalibs.04e057b8769ebec90f4eaa3993bed48a602f6bdf88a558bf173827bbbbd44392
 #@git:dc96d8a020e83b16dd7a8bd093bdb00ab2b944c0:s6-portable-utils
 
 
@@ -46,7 +48,7 @@ cd 's6-portable-utils'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.4c6bb8bcee00bd264a1cf26c17e36d7155f840f53128be18cdd5d1f00db157eb/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.04e057b8769ebec90f4eaa3993bed48a602f6bdf88a558bf173827bbbbd44392/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,37 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+skalibs.4c6bb8bcee00bd264a1cf26c17e36d7155f840f53128be18cdd5d1f00db157eb
-#+execline.98b288bf884e98dfd1774d38c3ce0cd767b1c122ae8582ce137ee9f7d325e67b
-#+s6.8c7ff734f64e9c89d65907441f5ca6058d8e7eb56d19f44ec7bd9c1e1c9db4d9
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+skalibs.04e057b8769ebec90f4eaa3993bed48a602f6bdf88a558bf173827bbbbd44392
+#+execline.2d9890704cb30e173554301ee68511361318af7395d96396d35c302e5dff922e
+#+s6.072c6be2de59334ae0f8fe3b95baa3fce42bf15b25d8d4c2162b68f794a1f19b
 #@git:a4756f00b3823952580d1fee704675c6f813a248:s6-rc
 
 
@@ -48,7 +50,7 @@ cd 's6-rc'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.4c6bb8bcee00bd264a1cf26c17e36d7155f840f53128be18cdd5d1f00db157eb/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.04e057b8769ebec90f4eaa3993bed48a602f6bdf88a558bf173827bbbbd44392/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,34 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
 #@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.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+zsh.b2e3d0846aaa9fbaff883701998485f288f4cebfdcedabc88d3140162c6bc6b3
-#+pthbs-banginstall.a459b0c5dfd826f3cdbf00e997067dffc3d4f7ec54ff46e47567b1f2b276805d
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+zsh.fcffbffcb0c0c3352f1cbfa0cc46559dfa56aa4095d5877892aa4b0e021fdc74
+#+pthbs-banginstall.576ac5077b84a6b4fe98be3f49056422e94f7f547287656cd09e8fce9ce3bd7d
 #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep
 
 
diff --git a/variants/ccx-x86_64/squashfs-tools b/variants/ccx-x86_64/squashfs-tools
@@ -1,37 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+attr.60365a4287f9b558c08915449f9df46bce037011889df1ae7ac2be0346a324e6
-#+zstd.c1107c320609d03324f44b811645887857b5858b8b443e1892459697d08d6f6c
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+attr.669f424a8e22c718fb05548f0588af500a05bd3e731c7d4492e9d94dd19c9ae8
+#+zstd.1bfd81018a42b01b2b301cfc74c160e4137f03a31a0adeaa86a6569cc95b1717
 #@untar:-z:sha256:4672b5c47d9418d3a5ae5b243defc6d9eae8275b9771022247c6a6082c815914:.
 
 
diff --git a/variants/ccx-x86_64/strace b/variants/ccx-x86_64/strace
@@ -1,38 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+m4.6f7bd3298835d0609008d0fbdb57c9ba9867d8710ad92c1fbdc644f1f6e0ac73
-#+patch.141394d3463b9153bdd6b421d8f10b79dd1c458eafb2244bd9af5d7638e67a08
-#+libunwind.23be74e83bb5c43c0fd4381a82a8f99ca3d13b2630236c1cbe3264708c7396a0
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+m4.30d10cc3eee1114a0e9c629a357a10cc0b9acc4d5eff1c594d6ed9a1db30462f
+#+patch.6a227048016d19b54309e21e725a704d23707bb366d384df4cd30eaccaae3f55
+#+libunwind.bcfefdb2dece168ca450d01840738548b9884c5aaaef77350e26b69d5d0b99b8
 #@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.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-dosfstools.983566a17821fcb32de0dddb7d6e785978c7273a96fc2351328089f9b600a4b9
-#+busybox-e2fsprogs.8f553a043e9d98e5e9d7268a166f7384a119d4819491a8839add7fc8ddb11892
-#+busybox-iproute2.81e4a1c96593d1bd624ee0bb11a204e0534c0b1cdc2c2e264a798f7569c52aca
-#+busybox-iputils.446fea1101fdfdf8b1b5af0ad5a4b2d2aa29adcaad812657ae48591fd224a396
-#+busybox-net-misc.ca6a84e212d8f555a0eac8637c83af010eca98db095db6f59171d35f91bc6935
-#+busybox-net-tools.f75ed05accc163299209dd375747e79e74e2d339373e6a80e6fe9373019cd6cb
-#+busybox-traceroute.1b0be7e3408d7589fa42d9e8f6a35cbb731297ed1c31e85ab87c9455d6b41068
-#+busybox-wget.b1eabcbee77e23b2340e1d3728d08f2565d5ec2a85ad485524f640b0cf69607e
-#+busybox-chpst.4b8ecfc8e205aee07b69f3e84d25b36637f765f53104f264f6f1c6fddda421e7
-#+busybox-console.8c83a1e67dcbd4ed580eadbbede4b0fec4f39ba77eb7a88f3c7113fca3b1a4f2
-#+busybox-getty.fc722cd28dddbc98d4991e91f764175fbe14d0636cf7e9e7d2f6149686ecb97e
-#+busybox-i2c-tools.48da2f9070109fcd7b1c6b437e5594c7331833411a67d74bece7751d8caba5e4
-#+busybox-linux-extra.8fec0ca34fa9ccc3eb472504473966830b1fa2c3c312a43f1d85867cea375fbc
-#+busybox-mtd-utils.1b7a0851def92f071f7230dc1e5b43d5b1cf7dc93de43d5392eaf97618fb90b9
-#+busybox-shadow.e05e541ad31c2afda4d355ab59727b2cf277e7047cfe312689a3d56bf3e2f593
-#+busybox-su.3151f0c0e0d3703fd8da9933b3fbe21bb51a78140d8caaa990e375f61c95d60e
-#+busybox-util-linux-priv.b38cb2fdda0edc168b3174cf7fc77eb101dcf56b6455d886fc931571120317ae
-#+busybox-logging.8282676a88f6e0bfc4a85146e7130c07749d58a5e9cc66d5e45ca8aa955f725f
-#+busybox-cron.dcf107e80707f311473e574da4dae533dc5944aa528156e7dfeedde136fad677
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+nawk.3d4adac0ba89766e0cafa44e623d55d4318d90e397bf76e0cf69011d7c059f07
-#+diffutils.2b09d2d83c94d2c37771fd4f753e86e8353ee88125c07a6230c6c0d219dc1bff
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+aat.97fbb40d245ea2984c869eb6f1e8c19485da1a82fd8fea4ed8b3b687c5dd9ef4
-#+fileset.e83e65120cbc6d8d6f49d3f8781abc2bf15c55e7422283d36288dca3c1c70a82
-#+rsync.0ca6bbb420c9bdf6e275ff83e55e05eb3913d856e06eb13b4b01ef7fbe5d7198
-#+execline.98b288bf884e98dfd1774d38c3ce0cd767b1c122ae8582ce137ee9f7d325e67b
-#+kbd.870c31fc4995806ce3f8dfb1955f1736d3de97d2811821a36c39e3cf5ef792e5
-#+mdevd.11651871fcf02c1e7564f18b16ede6717c1b41e0218727b5f954f6c22b8d461d
-#+s6-linux-utils.89d1a4d5ccf1de14c59411eb7c04779610b1863bf6a0b4c8e646dfbee04544a2
-#+s6-rc.d71d713f11f2ae7ce2d47bf977e8a3081c0ed5b9cb70bb24724998e84f8a8151
-#+s6.8c7ff734f64e9c89d65907441f5ca6058d8e7eb56d19f44ec7bd9c1e1c9db4d9
-#+zsh.b2e3d0846aaa9fbaff883701998485f288f4cebfdcedabc88d3140162c6bc6b3
-#+libcgroup.248d6cf1327da9bd76bb1a3a79c00277ea38fe83a027f2bc0d5a8e8e4b174b8a
-#+system-config-scripts.52163cfdd9131da0193b818dd60fed63a4746e5b09f4ce7ee6db426361cda207
-#+logincaps.34d03123840db91f340c267337e1fd2d43fee0d95c8b6f711de7ff2c3ffb34e0
-#+busybox.892e0a7f8d598c92df2a50eeeaec5012295a610bc578da7c58f0d6fbd30eaf67
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-dosfstools.bd9f2a329ddc9500a0b1d41767f0f4c80465d5d9af7f5d373666a51d35ae48ec
+#+busybox-e2fsprogs.2c541e5e1c8b7d2c147f6160d3ab92d89292a22b40fcf012c2ff1e709be394f4
+#+busybox-iproute2.a62d2e42193917f401c9a64e9fbbc97fc91e4a6064e886afa4210064cf1848d3
+#+busybox-iputils.71b6dbfef6b576a24160e102004c80aaf7837038bf42457b40215d38b80c9a5c
+#+busybox-net-misc.8f7dba414abce07473c2a3821086eb5147a2099a921d2365a81a3c16fa975fc2
+#+busybox-net-tools.cd08a41275209fb450e1a51c5d2c7de1abcdfe263190d0479e23d396fd0a61eb
+#+busybox-traceroute.c400683e9bf8d40f2d3b5236cac481e192fa0eaa6ab5dfabfbfffd365e8b8b50
+#+busybox-wget.79b50d20c9545dd941e0434bd64504d8369d24a4300304eeeb05ba3018affd5b
+#+busybox-chpst.955df8c837a844e1f1ffa117dedad7f202b85b3249be89901ccbcf28c5c7b805
+#+busybox-console.738d93ed50aee55c7f727fe85af0dbfad5897923e1c4ae0212538482d02009e6
+#+busybox-getty.86d09199ca03e869469ddca340377204d852bb2c1ea1b1712bf4276ce915641d
+#+busybox-i2c-tools.ba8892e9b938d0f9f26d6abf912400dd699bd9dd9ea5117be1c982d081f4b854
+#+busybox-linux-extra.ba3ab388d30aae158923323d139d36824359ef91e245dcd3c3d51d9dba00dae6
+#+busybox-mtd-utils.d4cfd607db2e0da3c1b9914aa67600440dc1dbdf57ed31a8f3ca95824d2607c7
+#+busybox-shadow.8ace403350ee33fa804385f4ae1c957ec0f4b26a031e23d74493a8bd96191e33
+#+busybox-su.b7030f31914b1f2d4e1c6d1f94ec207a51064374faffdd73962e64b955457983
+#+busybox-util-linux-priv.39d056aa0e75b5d17fb08a4b79898a4a8a9d3dbc05e4da8d98a963db36ba87ec
+#+busybox-logging.0f3cb2c5ebf2debb281e35c86d902094af5ba3be298cb32ae940fc0c53388d15
+#+busybox-cron.e7d9db51b1fbbd3961867e5c1eb18318223a7935da074f833636f3acb2db180f
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+nawk.257a482c0dc30655341c73bf73ba2548fd6c9a85b1be5fddc14b0504a0534e86
+#+diffutils.f4b7fa30ef951de0112469f276961b9e968b1d4e712eecb38a2ae62587d4d18c
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+aat.98efcd00ec59fc8aacb8047bca22053d481e6795939951f703d7a739c510bc40
+#+fileset.256b78923a82e97a653e2576f2689bc8c0e83e0de36228c5ac6a008e489d547d
+#+rsync.d52f4b040894f801b7ef5bdf0020ca5148e3a381dfe5b8ab59986eae01385461
+#+execline.2d9890704cb30e173554301ee68511361318af7395d96396d35c302e5dff922e
+#+kbd.4305d8e0bf8376f60cedb343f17734f12c3e9fb13ccbb4761224a665ee839da3
+#+mdevd.1265568607a05bbece20d9a210b1531ac511fcc0bca46a00fa5afebe563198dd
+#+s6-linux-utils.2a736046fe6da8024685322b3df7004d1f280c5d3d153ad5ef348d471492cdf9
+#+s6-rc.12efc7aa415a2788813c2e120799306826f0d36272e744925d1d5a63d4b6122d
+#+s6.072c6be2de59334ae0f8fe3b95baa3fce42bf15b25d8d4c2162b68f794a1f19b
+#+zsh.fcffbffcb0c0c3352f1cbfa0cc46559dfa56aa4095d5877892aa4b0e021fdc74
+#+libcgroup.26f2be8362f362aad9cd6de5d212e81d14ae8f3b2d29c8eda5218e607833a65b
+#+system-config-scripts.25fcfa99368483229e2156af03bdbbd5f71555da83d46ce679cbaa34152f2aee
+#+logincaps.480b5cffcb1f7426ca400b41f7947d610dad8227dce5f026cd32f95e52b87cef
+#+busybox.e49e298fec9b4216e00b954eca497cf2eb0809b2f23a2bc4956404b389b6bf1b
 #@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.4ce314196f1171669765406b62a9a51c73489fccedcde27efbf623d392895028' \
-	'pthbs_path_mdevd=/home/ccx/versions/env.cb726a293e4601c572e77aa2448798b0d063a5281060fd9f99803a5e0e06cb84' \
+	'pthbs_path_containers=/home/ccx/versions/env.d782d3f7694987c4807be354fc7596e772b7cba6db16aa9becd8fb907e8a8d09' \
+	'pthbs_path_mdevd=/home/ccx/versions/env.20b1860ca24f5a2c4952f9b65b5fc7fd380bbd210e4365cdbbfc4f9cf28eabe7' \
 	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.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-dosfstools.983566a17821fcb32de0dddb7d6e785978c7273a96fc2351328089f9b600a4b9
-#+busybox-e2fsprogs.8f553a043e9d98e5e9d7268a166f7384a119d4819491a8839add7fc8ddb11892
-#+busybox-iproute2.81e4a1c96593d1bd624ee0bb11a204e0534c0b1cdc2c2e264a798f7569c52aca
-#+busybox-iputils.446fea1101fdfdf8b1b5af0ad5a4b2d2aa29adcaad812657ae48591fd224a396
-#+busybox-net-misc.ca6a84e212d8f555a0eac8637c83af010eca98db095db6f59171d35f91bc6935
-#+busybox-net-tools.f75ed05accc163299209dd375747e79e74e2d339373e6a80e6fe9373019cd6cb
-#+busybox-traceroute.1b0be7e3408d7589fa42d9e8f6a35cbb731297ed1c31e85ab87c9455d6b41068
-#+busybox-wget.b1eabcbee77e23b2340e1d3728d08f2565d5ec2a85ad485524f640b0cf69607e
-#+busybox-chpst.4b8ecfc8e205aee07b69f3e84d25b36637f765f53104f264f6f1c6fddda421e7
-#+busybox-console.8c83a1e67dcbd4ed580eadbbede4b0fec4f39ba77eb7a88f3c7113fca3b1a4f2
-#+busybox-getty.fc722cd28dddbc98d4991e91f764175fbe14d0636cf7e9e7d2f6149686ecb97e
-#+busybox-i2c-tools.48da2f9070109fcd7b1c6b437e5594c7331833411a67d74bece7751d8caba5e4
-#+busybox-linux-extra.8fec0ca34fa9ccc3eb472504473966830b1fa2c3c312a43f1d85867cea375fbc
-#+busybox-mtd-utils.1b7a0851def92f071f7230dc1e5b43d5b1cf7dc93de43d5392eaf97618fb90b9
-#+busybox-shadow.e05e541ad31c2afda4d355ab59727b2cf277e7047cfe312689a3d56bf3e2f593
-#+busybox-su.3151f0c0e0d3703fd8da9933b3fbe21bb51a78140d8caaa990e375f61c95d60e
-#+busybox-util-linux-priv.b38cb2fdda0edc168b3174cf7fc77eb101dcf56b6455d886fc931571120317ae
-#+busybox-logging.8282676a88f6e0bfc4a85146e7130c07749d58a5e9cc66d5e45ca8aa955f725f
-#+busybox-cron.dcf107e80707f311473e574da4dae533dc5944aa528156e7dfeedde136fad677
-#+s6.8c7ff734f64e9c89d65907441f5ca6058d8e7eb56d19f44ec7bd9c1e1c9db4d9
-#+s6-rc.d71d713f11f2ae7ce2d47bf977e8a3081c0ed5b9cb70bb24724998e84f8a8151
-#+s6-portable-utils.2d3e0e2aecdf67c788caff7809c4b2880d4c70e855e3551db69b4a52d2345187
-#+s6-linux-init.a02af645467653d1ae0c475ebbae7551976427f3f08e42e9eb574ee115ad070b
-#+execline.98b288bf884e98dfd1774d38c3ce0cd767b1c122ae8582ce137ee9f7d325e67b
-#+system-config-rc.16fe4c732f5af91d1fc1dfd6bcf0d831f4ccc1213105c1110c68a656bef9c860
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-dosfstools.bd9f2a329ddc9500a0b1d41767f0f4c80465d5d9af7f5d373666a51d35ae48ec
+#+busybox-e2fsprogs.2c541e5e1c8b7d2c147f6160d3ab92d89292a22b40fcf012c2ff1e709be394f4
+#+busybox-iproute2.a62d2e42193917f401c9a64e9fbbc97fc91e4a6064e886afa4210064cf1848d3
+#+busybox-iputils.71b6dbfef6b576a24160e102004c80aaf7837038bf42457b40215d38b80c9a5c
+#+busybox-net-misc.8f7dba414abce07473c2a3821086eb5147a2099a921d2365a81a3c16fa975fc2
+#+busybox-net-tools.cd08a41275209fb450e1a51c5d2c7de1abcdfe263190d0479e23d396fd0a61eb
+#+busybox-traceroute.c400683e9bf8d40f2d3b5236cac481e192fa0eaa6ab5dfabfbfffd365e8b8b50
+#+busybox-wget.79b50d20c9545dd941e0434bd64504d8369d24a4300304eeeb05ba3018affd5b
+#+busybox-chpst.955df8c837a844e1f1ffa117dedad7f202b85b3249be89901ccbcf28c5c7b805
+#+busybox-console.738d93ed50aee55c7f727fe85af0dbfad5897923e1c4ae0212538482d02009e6
+#+busybox-getty.86d09199ca03e869469ddca340377204d852bb2c1ea1b1712bf4276ce915641d
+#+busybox-i2c-tools.ba8892e9b938d0f9f26d6abf912400dd699bd9dd9ea5117be1c982d081f4b854
+#+busybox-linux-extra.ba3ab388d30aae158923323d139d36824359ef91e245dcd3c3d51d9dba00dae6
+#+busybox-mtd-utils.d4cfd607db2e0da3c1b9914aa67600440dc1dbdf57ed31a8f3ca95824d2607c7
+#+busybox-shadow.8ace403350ee33fa804385f4ae1c957ec0f4b26a031e23d74493a8bd96191e33
+#+busybox-su.b7030f31914b1f2d4e1c6d1f94ec207a51064374faffdd73962e64b955457983
+#+busybox-util-linux-priv.39d056aa0e75b5d17fb08a4b79898a4a8a9d3dbc05e4da8d98a963db36ba87ec
+#+busybox-logging.0f3cb2c5ebf2debb281e35c86d902094af5ba3be298cb32ae940fc0c53388d15
+#+busybox-cron.e7d9db51b1fbbd3961867e5c1eb18318223a7935da074f833636f3acb2db180f
+#+s6.072c6be2de59334ae0f8fe3b95baa3fce42bf15b25d8d4c2162b68f794a1f19b
+#+s6-rc.12efc7aa415a2788813c2e120799306826f0d36272e744925d1d5a63d4b6122d
+#+s6-portable-utils.02792dece4e2daeccf961730e6272997049a8860462f4255a078142d4c3c6eaf
+#+s6-linux-init.4cba678d2813e4f52f7010eeb4f83cf4059e156cb62ab3f2b992a54b0e1485e0
+#+execline.2d9890704cb30e173554301ee68511361318af7395d96396d35c302e5dff922e
+#+system-config-rc.fcf032d58123f65081a4f4540d0405381e6b6448e9c8dfacef9e063912f07997
 
 
 # - build script start -
@@ -76,7 +76,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-s6rcdb=/home/ccx/versions/system-config-rc.16fe4c732f5af91d1fc1dfd6bcf0d831f4ccc1213105c1110c68a656bef9c860/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.fcf032d58123f65081a4f4540d0405381e6b6448e9c8dfacef9e063912f07997/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.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+s6-rc.d71d713f11f2ae7ce2d47bf977e8a3081c0ed5b9cb70bb24724998e84f8a8151
-#+fileset.e83e65120cbc6d8d6f49d3f8781abc2bf15c55e7422283d36288dca3c1c70a82
-#+system-config.9e0d352ef25be318f6f0a49eecbd83b255a96a6275b09a92d52c2df14e3e186e
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+s6-rc.12efc7aa415a2788813c2e120799306826f0d36272e744925d1d5a63d4b6122d
+#+fileset.256b78923a82e97a653e2576f2689bc8c0e83e0de36228c5ac6a008e489d547d
+#+system-config.9ea8f5c3be59c17175dad30ed8559b68ce6a93d84d5be6686a1f735c7696d2df
 
 
 # - build script start -
@@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-src=/home/ccx/versions/system-config.9e0d352ef25be318f6f0a49eecbd83b255a96a6275b09a92d52c2df14e3e186e/config/s6-rc-source
+src=/home/ccx/versions/system-config.9ea8f5c3be59c17175dad30ed8559b68ce6a93d84d5be6686a1f735c7696d2df/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.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+zsh.b2e3d0846aaa9fbaff883701998485f288f4cebfdcedabc88d3140162c6bc6b3
-#+pthbs-banginstall.a459b0c5dfd826f3cdbf00e997067dffc3d4f7ec54ff46e47567b1f2b276805d
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+zsh.fcffbffcb0c0c3352f1cbfa0cc46559dfa56aa4095d5877892aa4b0e021fdc74
+#+pthbs-banginstall.576ac5077b84a6b4fe98be3f49056422e94f7f547287656cd09e8fce9ce3bd7d
 #@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.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+zsh.b2e3d0846aaa9fbaff883701998485f288f4cebfdcedabc88d3140162c6bc6b3
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+zsh.fcffbffcb0c0c3352f1cbfa0cc46559dfa56aa4095d5877892aa4b0e021fdc74
 #@git:6dfbe33079e2f8c64c5daed29aa1ea3e7e3f2d59:system-config-zsh
 
 
diff --git a/variants/ccx-x86_64/tinyssh b/variants/ccx-x86_64/tinyssh
@@ -1,35 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
 #@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.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+execline.98b288bf884e98dfd1774d38c3ce0cd767b1c122ae8582ce137ee9f7d325e67b
-#+pthbs-banginstall.a459b0c5dfd826f3cdbf00e997067dffc3d4f7ec54ff46e47567b1f2b276805d
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+execline.2d9890704cb30e173554301ee68511361318af7395d96396d35c302e5dff922e
+#+pthbs-banginstall.576ac5077b84a6b4fe98be3f49056422e94f7f547287656cd09e8fce9ce3bd7d
 #@sha256:664430d033e0b491a5ed90cb39cb17cddb57ac0be9f3f2bf014264f3c17d55df:user-env
 
 
diff --git a/variants/ccx-x86_64/userspace.environment b/variants/ccx-x86_64/userspace.environment
@@ -1,90 +1,92 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-dosfstools.983566a17821fcb32de0dddb7d6e785978c7273a96fc2351328089f9b600a4b9
-#+busybox-e2fsprogs.8f553a043e9d98e5e9d7268a166f7384a119d4819491a8839add7fc8ddb11892
-#+busybox-iproute2.81e4a1c96593d1bd624ee0bb11a204e0534c0b1cdc2c2e264a798f7569c52aca
-#+busybox-iputils.446fea1101fdfdf8b1b5af0ad5a4b2d2aa29adcaad812657ae48591fd224a396
-#+busybox-net-misc.ca6a84e212d8f555a0eac8637c83af010eca98db095db6f59171d35f91bc6935
-#+busybox-net-tools.f75ed05accc163299209dd375747e79e74e2d339373e6a80e6fe9373019cd6cb
-#+busybox-traceroute.1b0be7e3408d7589fa42d9e8f6a35cbb731297ed1c31e85ab87c9455d6b41068
-#+busybox-wget.b1eabcbee77e23b2340e1d3728d08f2565d5ec2a85ad485524f640b0cf69607e
-#+busybox-chpst.4b8ecfc8e205aee07b69f3e84d25b36637f765f53104f264f6f1c6fddda421e7
-#+busybox-console.8c83a1e67dcbd4ed580eadbbede4b0fec4f39ba77eb7a88f3c7113fca3b1a4f2
-#+busybox-getty.fc722cd28dddbc98d4991e91f764175fbe14d0636cf7e9e7d2f6149686ecb97e
-#+busybox-i2c-tools.48da2f9070109fcd7b1c6b437e5594c7331833411a67d74bece7751d8caba5e4
-#+busybox-linux-extra.8fec0ca34fa9ccc3eb472504473966830b1fa2c3c312a43f1d85867cea375fbc
-#+busybox-mtd-utils.1b7a0851def92f071f7230dc1e5b43d5b1cf7dc93de43d5392eaf97618fb90b9
-#+busybox-shadow.e05e541ad31c2afda4d355ab59727b2cf277e7047cfe312689a3d56bf3e2f593
-#+busybox-su.3151f0c0e0d3703fd8da9933b3fbe21bb51a78140d8caaa990e375f61c95d60e
-#+busybox-util-linux-priv.b38cb2fdda0edc168b3174cf7fc77eb101dcf56b6455d886fc931571120317ae
-#+busybox-logging.8282676a88f6e0bfc4a85146e7130c07749d58a5e9cc66d5e45ca8aa955f725f
-#+busybox-cron.dcf107e80707f311473e574da4dae533dc5944aa528156e7dfeedde136fad677
-#+attr.60365a4287f9b558c08915449f9df46bce037011889df1ae7ac2be0346a324e6
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+diffutils.2b09d2d83c94d2c37771fd4f753e86e8353ee88125c07a6230c6c0d219dc1bff
-#+patch.141394d3463b9153bdd6b421d8f10b79dd1c458eafb2244bd9af5d7638e67a08
-#+flex.7dec2a01c6efef521a5a6c4ebc6b04c2375a2b25812bf4cdbff26899deabc771
-#+bison.8af5e3d228dac6d59cb1010846136f9be107b4af139ab788ba8aad87195a98ff
-#+rsync.0ca6bbb420c9bdf6e275ff83e55e05eb3913d856e06eb13b4b01ef7fbe5d7198
-#+execline.98b288bf884e98dfd1774d38c3ce0cd767b1c122ae8582ce137ee9f7d325e67b
-#+s6.8c7ff734f64e9c89d65907441f5ca6058d8e7eb56d19f44ec7bd9c1e1c9db4d9
-#+s6-rc.d71d713f11f2ae7ce2d47bf977e8a3081c0ed5b9cb70bb24724998e84f8a8151
-#+s6-portable-utils.2d3e0e2aecdf67c788caff7809c4b2880d4c70e855e3551db69b4a52d2345187
-#+s6-linux-utils.89d1a4d5ccf1de14c59411eb7c04779610b1863bf6a0b4c8e646dfbee04544a2
-#+s6-linux-init.a02af645467653d1ae0c475ebbae7551976427f3f08e42e9eb574ee115ad070b
-#+mdevd.11651871fcf02c1e7564f18b16ede6717c1b41e0218727b5f954f6c22b8d461d
-#+s6-dns.d0406727680d045dcd4881e79b9594a95f48972e0ccaaddf71c5f045fd2b8075
-#+libressl.0e2a2d650925ed59678ae580bd35afecdf5b3b5704b1d86d990ad3ff223dcb84
-#+s6-networking.24f605db99103f37a846eca20da34edb8fa272b1e4342724153c0492e7df2ace
-#+zsh.b2e3d0846aaa9fbaff883701998485f288f4cebfdcedabc88d3140162c6bc6b3
-#+pthbs-banginstall.a459b0c5dfd826f3cdbf00e997067dffc3d4f7ec54ff46e47567b1f2b276805d
-#+aat.97fbb40d245ea2984c869eb6f1e8c19485da1a82fd8fea4ed8b3b687c5dd9ef4
-#+confz.d0db483cef072b2fefbf5e7c8561b56d9460a431865d1d050e59e063f37339d0
-#+containers.315cef2ed7378e66a71b7d918dd1fac5f60e11b949cb1e22f65cad607768c89b
-#+fileset.e83e65120cbc6d8d6f49d3f8781abc2bf15c55e7422283d36288dca3c1c70a82
-#+logincaps.34d03123840db91f340c267337e1fd2d43fee0d95c8b6f711de7ff2c3ffb34e0
-#+snaprep.d44dcab3a919277ad36db507def93c5699006c4ca33280088bf5ca7fc152b8d0
-#+curl.9dade7e2f0a81d8dc07a96e32b5d0ff931bbcf951ebb1083082085e4b32d49d5
-#+git.bd9f1333f980b807b9ab7c74f5096de0b5e907b25ea69e7d05d89e9a497a5857
-#+xbps.2a97d80dfbff70cdd481a5f611f189dec25604feb2a036d846e4694f0104717f
-#+apk-tools.1c16fab9d946f7bbdecf734700681d37a013ab60a45c9624270345004a20eefd
-#+getent.6938ab9105e01fb023c90f77721ded92d4af96fe4ca1780cf2587bf72cf1c1f6
-#+getconf.9e5df47fc7bfe1a480fab7b42a834c583d6ecd6f9c0528feef768451c8296246
-#+iconv.2cfbb56faa65804fca0297490c7e3b1a14e5de4d64e7b7e331213ce0a6ec29e6
-#+libcap.3d1d91f4a1728a27046d5ef5c0b4eefc60cfe82824ce1272b7e0a7c6b9e78808
-#+applyuidgid-caps.313a50f6417964d873219b51d963215764840372ba5dc304473976a088c97fc4
-#+ccx-utils.ce34c3f8769025b772d7d1e8bb0ba77b525f890a862e2e050757593e3bbb2399
-#+user-env.e95f921c0e0c46a687a87dd8e6463b843ba738b3b1407a8a2247e8ac1e37c449
-#+strace.6d6f3c5a61aae048c5eac726643f58360efe34c476c31e229fbdb4389d32c568
-#+mlog.4dc4985f2bf9e890262e110ab9a9cbe4e71c02ea6cdd507a72b565a0b6fd48a4
-#+findutils.0754535d9a07170d7e9433fcb020486c8efd4d8d8d8bb604d56428302e3e8068
-#+nawk.3d4adac0ba89766e0cafa44e623d55d4318d90e397bf76e0cf69011d7c059f07
-#+squashfs-tools.fede6a731c8113a0e88074f0739f238ab7c41763bc16b876a624f25baee216be
-#+mandoc.45fe2e711d973ff4dd18f201ac24cdf4ada609fe8ec1379a9c4cbb27844e0311
-#+tinyssh.681544a55eadc347b0ffd5f3188f97d8bb23d6c40930d0b9e42b1a6745bf4dcb-
\ No newline at end of file
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-dosfstools.bd9f2a329ddc9500a0b1d41767f0f4c80465d5d9af7f5d373666a51d35ae48ec
+#+busybox-e2fsprogs.2c541e5e1c8b7d2c147f6160d3ab92d89292a22b40fcf012c2ff1e709be394f4
+#+busybox-iproute2.a62d2e42193917f401c9a64e9fbbc97fc91e4a6064e886afa4210064cf1848d3
+#+busybox-iputils.71b6dbfef6b576a24160e102004c80aaf7837038bf42457b40215d38b80c9a5c
+#+busybox-net-misc.8f7dba414abce07473c2a3821086eb5147a2099a921d2365a81a3c16fa975fc2
+#+busybox-net-tools.cd08a41275209fb450e1a51c5d2c7de1abcdfe263190d0479e23d396fd0a61eb
+#+busybox-traceroute.c400683e9bf8d40f2d3b5236cac481e192fa0eaa6ab5dfabfbfffd365e8b8b50
+#+busybox-wget.79b50d20c9545dd941e0434bd64504d8369d24a4300304eeeb05ba3018affd5b
+#+busybox-chpst.955df8c837a844e1f1ffa117dedad7f202b85b3249be89901ccbcf28c5c7b805
+#+busybox-console.738d93ed50aee55c7f727fe85af0dbfad5897923e1c4ae0212538482d02009e6
+#+busybox-getty.86d09199ca03e869469ddca340377204d852bb2c1ea1b1712bf4276ce915641d
+#+busybox-i2c-tools.ba8892e9b938d0f9f26d6abf912400dd699bd9dd9ea5117be1c982d081f4b854
+#+busybox-linux-extra.ba3ab388d30aae158923323d139d36824359ef91e245dcd3c3d51d9dba00dae6
+#+busybox-mtd-utils.d4cfd607db2e0da3c1b9914aa67600440dc1dbdf57ed31a8f3ca95824d2607c7
+#+busybox-shadow.8ace403350ee33fa804385f4ae1c957ec0f4b26a031e23d74493a8bd96191e33
+#+busybox-su.b7030f31914b1f2d4e1c6d1f94ec207a51064374faffdd73962e64b955457983
+#+busybox-util-linux-priv.39d056aa0e75b5d17fb08a4b79898a4a8a9d3dbc05e4da8d98a963db36ba87ec
+#+busybox-logging.0f3cb2c5ebf2debb281e35c86d902094af5ba3be298cb32ae940fc0c53388d15
+#+busybox-cron.e7d9db51b1fbbd3961867e5c1eb18318223a7935da074f833636f3acb2db180f
+#+attr.669f424a8e22c718fb05548f0588af500a05bd3e731c7d4492e9d94dd19c9ae8
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+diffutils.f4b7fa30ef951de0112469f276961b9e968b1d4e712eecb38a2ae62587d4d18c
+#+patch.6a227048016d19b54309e21e725a704d23707bb366d384df4cd30eaccaae3f55
+#+flex.0f73e9b8fa28dc3baf349d08527e0d33926692a897f6efe26519a4c9d901aad4
+#+bison.336db60a3e340b6f18968c281b378d99a16637d0f94c8e26de83882275b643bc
+#+rsync.d52f4b040894f801b7ef5bdf0020ca5148e3a381dfe5b8ab59986eae01385461
+#+execline.2d9890704cb30e173554301ee68511361318af7395d96396d35c302e5dff922e
+#+s6.072c6be2de59334ae0f8fe3b95baa3fce42bf15b25d8d4c2162b68f794a1f19b
+#+s6-rc.12efc7aa415a2788813c2e120799306826f0d36272e744925d1d5a63d4b6122d
+#+s6-portable-utils.02792dece4e2daeccf961730e6272997049a8860462f4255a078142d4c3c6eaf
+#+s6-linux-utils.2a736046fe6da8024685322b3df7004d1f280c5d3d153ad5ef348d471492cdf9
+#+s6-linux-init.4cba678d2813e4f52f7010eeb4f83cf4059e156cb62ab3f2b992a54b0e1485e0
+#+mdevd.1265568607a05bbece20d9a210b1531ac511fcc0bca46a00fa5afebe563198dd
+#+s6-dns.b5c5ba9bee67c7c21488e97008762d870857651f32018adcce746fc884e2e817
+#+libressl.149d83ff736e1ca773a90e36086cd74e89942d184091ed5ac7a6470bcf6c3ef5
+#+s6-networking.391cd4ee13a0d22df24847dd53d6afdb13dedeeec2e747cce2057dd77c958805
+#+zsh.fcffbffcb0c0c3352f1cbfa0cc46559dfa56aa4095d5877892aa4b0e021fdc74
+#+pthbs-banginstall.576ac5077b84a6b4fe98be3f49056422e94f7f547287656cd09e8fce9ce3bd7d
+#+aat.98efcd00ec59fc8aacb8047bca22053d481e6795939951f703d7a739c510bc40
+#+confz.48817522c80a912157ee1e772af0adcb74de530ba60d7a6ac2764cf06c0251f8
+#+containers.4d7cb90d7e6d23fce7fb936fe044c1ed48a29dfe5a1f7faf613ac9e6cdf3c256
+#+fileset.256b78923a82e97a653e2576f2689bc8c0e83e0de36228c5ac6a008e489d547d
+#+logincaps.480b5cffcb1f7426ca400b41f7947d610dad8227dce5f026cd32f95e52b87cef
+#+snaprep.5d1269242bee362d9f6cb02127b304af238d438d9a525cd3b3e5651cadfb454f
+#+curl.571bad230d49f6ade91d0a376f99160e4d4906fbbfa6400ac6aa723e9eaa33c6
+#+git.9eb5d29be3f0076fa393b48b3138261071d328ed29ec18657a925141905fa348
+#+xbps.8865f2eff3e57ef75a2ca02a50e2be7c02e7d0a5e53aa1e7dfd825c4e849ac0e
+#+apk-tools.8c72a3f01914e3e9f5da89cd3e9ca1f863b90e45d35057e42a52a6fc0dc12094
+#+getent.6cda7a824c09f711c5d31134f9ecee6caf60b55d8e63ad542126febda7f7faf1
+#+getconf.efbf676fd1b52e044fb94a9fc87dd6609c5d3dd77330c5bba57fefbc54bdd5cc
+#+iconv.97a24f5267efac78b9e2025c4324d1e4e697943286ea0b28a31318950a1ce12c
+#+libcap.da38f24016be4eff73b3862da403658da0107cc476b4c5c269569b38c7e133a0
+#+applyuidgid-caps.3b7dff1fcc8c671e9c560bdd26bddb6d79b8f1627b621f389d4c406499f8f774
+#+ccx-utils.c67eb9f7f7362065137149d680038c399d65e4c0f0f71a33e6325d9deb632d60
+#+user-env.1bbd01a8daeaae080114bec91290731b1041aa0b2dc822c5f9ac1ecf9687e222
+#+strace.7f504b860e64b901c69efe1a85368693a9dd417c17562863161e21ae16f9cb42
+#+mlog.893b660f52f7c23261f952767c8d77be1549026c56e6eb607a49b069b264395a
+#+findutils.cdfc3f51aa3ba16c570868fa255761c70bf2eb952c4be03e84b8f0c760e07570
+#+nawk.257a482c0dc30655341c73bf73ba2548fd6c9a85b1be5fddc14b0504a0534e86
+#+squashfs-tools.1c25de720bbf1bc2eab2db00724e1058b338fbf27743fc476c31ca9490b2b450
+#+mandoc.3f2711a4e8e4db5685e56c96e6ed6a1e4f88c68bcfedaa164afcd72381778b00
+#+tinyssh.2b45b71634006774dccbc19be36d0b45c370266573dd7c292afcd15b805da21c+
\ 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.55844d58fdfeaeff910a4223faa23e9bb02bccd67b44af310d6ebf2fa381c2e3-
\ No newline at end of file
+#+linux-qemu-guest.4c311dd129df592d1c7db541bac5a9e7f12bb45479daa914799d93a486dc4e3c+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/xbps b/variants/ccx-x86_64/xbps
@@ -1,37 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+libarchive.fbf73edbb5a906a42aa3cb7057ad69cd550b7ebb0c46c23746c6dadb2dc0ca3b
-#+libressl.0e2a2d650925ed59678ae580bd35afecdf5b3b5704b1d86d990ad3ff223dcb84
-#+pkgconf-pkg-config.8f6b75c4c3fab946cd53a5ea0154ed8133db1909133a64e0c9696cb120af6bc7
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+libarchive.ccf2b148827c65d9788a6519d962d6d276ee302e02807d212dda8fc41f01fb2c
+#+libressl.149d83ff736e1ca773a90e36086cd74e89942d184091ed5ac7a6470bcf6c3ef5
+#+pkgconf-pkg-config.9aa3902fbb930df881f7e5402b8c784ef1672caccff791830d913246ee8fd5c9
 #@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:.
 
 
diff --git a/variants/ccx-x86_64/zsh b/variants/ccx-x86_64/zsh
@@ -1,38 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+m4.6f7bd3298835d0609008d0fbdb57c9ba9867d8710ad92c1fbdc644f1f6e0ac73
-#+netbsd-curses.c2581cd57eb0726b500316784644e52b05ed360c1b4c1133931ef961b7ccb7c4
-#+libbsd.36c0b9cb9f16858c42e523af2cda1aa56412fe14fcf8ccf037f8ab851897566c
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+m4.30d10cc3eee1114a0e9c629a357a10cc0b9acc4d5eff1c594d6ed9a1db30462f
+#+netbsd-curses.5efddf0df412526b83495d64c666b885ff426ca073bc06187a0122c8e5f0abde
+#+libbsd.459b8c7148ca41118098040b5d91b21d322ac2109021aa9201c8d2ef3fe6be16
 #@git:c73505cc47870bd09e8e204d98ac5976e0d4cb52:zsh_config
 #@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:.
 
diff --git a/variants/ccx-x86_64/zstd b/variants/ccx-x86_64/zstd
@@ -1,35 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.65d260ea741365da3fc2ce1eb7a5d0a64e7a4d8710634e685efbeb0c26336986
-#+busybox-bzip2.83ec85ca2ce606228d0dea0babd3b476c9d2ef878594f945f93571efa4e50770
-#+busybox-gzip.3a3f3daf10211c629bf13c20feab720aa27bf2c0b55e9158a11b9e7dd0d5572e
-#+busybox-lzop.a09e9ae60b9e092b5eb7cd73cfe6508cb3bcf1df94af45d0c644029c6bd531a7
-#+busybox-unzip.52adc2289c609f5152a48cf8a6e061a7c966f686c440c5d3ee2ca092f8e1e628
-#+busybox-xz.2e59400ef9f13acf57b7d145fb8e04750aeaf6b00580a9ec34f59e86cf672f6f
-#+busybox-cpio.10d0da07a4ed740c0b7899e0b9e80299b66459394bab274443061b3ef607aed7
-#+busybox-dpkg.efcd6b3b86809e343a754108fc37ca091b76dde4b1b0378752a1835705779ed7
-#+busybox-rpm.e94612116f53c2b052880c4a8ce16eafbb5c1a324e0b5efa8e144d80195885c7
-#+busybox-tar.c632557afc256bd8bfa85861ce35cf9c3bcf502e94f5bfd09ddc34761ef0e2a8
-#+busybox-ed.ba3674f7eaecca4ecebe65ab45869268c21456fed6734b77e7f136e048b23dec
-#+busybox-sed.83f0f5f379c1f1a4ebf95b5323f62c0eb3afc540462e38baa97c4b2b94adb286
-#+busybox-vi.e1b5fe1339ee7ef87fbcce5da80c71edde103a1a6794d1aa3b050ea5abcd8956
-#+busybox-xxd.a04693574cd04a42eac5dbe28802e8e78d0ef7d54529c1bff6090b1a6d5ad0e9
-#+busybox-process-extra.c979547c061119a5fd2081708ba4a882ecd02ffa24dc333e5463771f266fab3f
-#+busybox-procps.e902dc07888332008f2f798c6a8f3e858dbb984579fc0459cda39a0b5e1067e7
-#+busybox-psmisc.ddcb142dab017cec5b24c43eb5338c462d9af76fd076c52ff577357ba01e3ffa
-#+busybox-ash.3a739ecb81c878dcdf9c29c2774911fa4c76539190c8604416e0ed503411fe43
-#+busybox-bc.83f19c8260c08b042070784ab24ee7d5b96f8b2c7c8eceb9e8958f8361515631
-#+busybox-coreutils.2be88dcebe075e38ea496e7c2d99c0070574c3746d0ae449919991c02218d762
-#+busybox-coreutils-extra.547d4d34a095b8c126b3721a238b0c1ff97dfc4a6c5df7f5cc588db6d15fe028
-#+busybox-daemontools.a7feca0c0afb74233755a96d7d1aa0bfd4bc1f31a6c896f7a4bfb3eda1d4d091
-#+busybox-grep.397854979752b224d42c10d1c551fef60f877c9de56f37a3c3fa14ad5de24f1f
-#+busybox-misc.0d0c17dd2adb29d1a591dccf8db281f3fe085843a15b14f4f3da66d746b0ce85
-#+busybox-sh.cafa567f15d96e8174047dafa71ef6841b967569061da735837c273e1677702b
-#+busybox-util-linux-unpriv.7000ec2b2f85e2bf43937f6313adaa9c3dc0cc8069eb3a157501c45d54d88d39
-#+busybox-findutils.97b0a574e7cac7d4e0605013125e6b989c2dee0dfc5614d5b26d2e6f2ff85d3b
-#+busybox-awk.24b76c21a3cfa3b026ea12b3c4cc47c389b3e2dc6570dff1b7791af34daccff4
-#+musl-cross-make.33d3912bbfb5511d77a4f251dc032fe58b2fb01ede7ff44325e16bf1d8d5d5e3
-#+gnu-make.e8fdd25c73782058290a999871d3e84e42d7d3ab7387f85d71ed9039d2814a2e
-#+busybox-diffutils.c93b32d1ce40845f072811f00bdd914b932fce7ba6162719e193a94fb171cedf
+#+busybox.705e40d117f5aa2f89a8350ad79cbe42a27a84a3f34d2d837e19837dddf477a2
+#+busybox-bzip2.9aac295e5e817c5e2f7cbcdf2c691332f90410b966c52a52b366c02f89c58f1a
+#+busybox-gzip.a12d14ba9fb558b6f77eeee63f18bf4e07b43e9a7e5e027c203ba712523a12fa
+#+busybox-lzop.9020e201bde47cbe2c340c497c4415c09926c336397fd4598fbae697bc52bcaf
+#+busybox-unzip.a73db77f40f8ca6fb92db81cc5b6757e12a61efead43deb1d2fbda8f9f0a03ee
+#+busybox-xz.5af8b55da984429f36e3abfe22818cb8ba7258bc07308051a3f685516837beca
+#+busybox-cpio.f2392052cbe8822fad2639b3da5d170e74bb3b7bb4f79fbe73bb857bf97714a1
+#+busybox-dpkg.55a07a8c1de90a72b6b87d130bcf939f022e8bc3851bd7d78a5f9947651f9369
+#+busybox-rpm.52ca0a951e1e594186c1ec430e760489fa79c90de190d19df5822a772fa565a4
+#+busybox-tar.d9f4289b518de0d8cd2c08656ba24151aa59035cbd9dbd079162acd532316856
+#+busybox-ed.9e68734f66fa8aa5b749b0040e045e654770b79876a5ce46552c14b9708528f4
+#+busybox-sed.5bcf8fb7955ceed3846671b6ed08ae871af19ea905278670781170e4e501ffde
+#+busybox-vi.044c23a7a6ac036ad3eb4c77a9d6b3a1bf61b71d53732aa7eebf37d0b273a805
+#+busybox-xxd.d9d8c9eeb8ec2751c0ba9b9412e52433977043de100aa390009f896b1d4cbce2
+#+busybox-process-extra.19dee3c37287b41e3374cf3ea70d88081999aed7c630d53c105edc2fe38ceadf
+#+busybox-procps.3c0099a1146f911bf75ea4a397c3b9c31860da127d47b5f6c872359c27d7cf14
+#+busybox-psmisc.309eb36366dce3d81645e7623cab42dd1f9699b97aef91ea9b02c9500459e594
+#+busybox-ash.cb03c858c9e41863d3bab854ba6a2cfd3a8c032ed01b796cd32acbf7b8e9d5c8
+#+busybox-bc.53c4413923bdf0fa0fd7811d0325bd93b342b99596fba7c2ba73ee20b28a13be
+#+busybox-coreutils.ce2ca81b464148b490b96cd8ef84607d3443f9bb8dfa79b30c107888a1daa823
+#+busybox-coreutils-extra.8a69f1652a22716fb87cbb3e6d7002ffb29bd97c42547875a7775bf3e46d5a49
+#+busybox-daemontools.ff374cf37b3caeef0372d301b729a43c59a7ac020c5d0737f791b61d980dae8a
+#+busybox-grep.2c445039cadae4c80896029685111925f7de89d068c543f615c2916b701321aa
+#+busybox-misc.db89d7058913c0d7f526ad1a53942940f88aa134c5380edc11cbd58edbce349a
+#+busybox-sh.71c79f9b1c53b50d32001e91f1217824d72a9772ccf3d36a12a99aa0bc9da7dc
+#+busybox-util-linux-unpriv.b7cf9a0cd6d5b248670cd060788a0d7df3f902e02426e30f7797943fa446264c
+#+busybox-findutils.3bae0a1f230b01870d5d4b0a0a1dc3e887995fd1ffd988762b95e576490746ef
+#+busybox-awk.921062d257ceaa2aceb672ff10b52fb561316a4a22b4c31d85be77ecc07c6776
+#+musl.5f30c2a28f9e275feaf17900573914a2d3f10882c162e8eee86566a25d502645
+#+gcc.c8235171a606b0a00ef6f557115e780ab41f13e45efbf5e9811691a21773a749
+#+binutils.e43fe14d1d420baaa4b42747fd8447b0cde2e67f26f7494feece03f432ef292a
+#+gnu-make.a50b9b5cd86312f8fb435fec3abe05ae1ffe5bc4bc47e316c15c6430e25100e5
+#+busybox-diffutils.d2fc4fbcc58e5da5391ff5f3378979ce2a5a8c85e249e4e3d77362d5ec68f3f1
 #@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.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+zsh.782bc6b39d4d5bdb5d869ae7854258affe53f637ba226431c7f728ea0734fd6c
-#+pthbs-banginstall.53ae4b7e39b904f1d4bc5ffc74ad321b72640e17a03d9ca9542ac815d18db241
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+zsh.3cfc27ae8f891aaae6d39ecb2634464105283d343f64ef141d045986afff6a81
+#+pthbs-banginstall.fc0afb8645b68b930e3cd4ec043ae7d36108814c1e73a3ae56f29bb50fd8b3d7
 #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat
 
 
diff --git a/variants/root-x86_64/abduco b/variants/root-x86_64/abduco
@@ -1,35 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
 #@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.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
 #@git:c7b36ed27103ee3f9aa01905ba1fac2d606079cf:alpine-keys
 
 
diff --git a/variants/root-x86_64/apk-tools b/variants/root-x86_64/apk-tools
@@ -1,39 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+patch.076d4ff4c78d93a698eb69b9bcf0c1ec0db1711016608ca949404f4ca6a3bc15
-#+libressl.ebb087f0e9b957025a9d9ee630fcc9cdc87fbf381ba272aecef55a89a91dbae3
-#+zstd.0bf21a672f99cc391d6b28c9f6872f82b4d1409b2cff1fb3e149fa6b8266a3f8
-#+pkgconf-pkg-config.16a3e6160fefe153ceebfea9add030039591396575b042b519213e1c41346ab6
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+patch.8ffbd0650e4352e1a62422cdc213249df8720035c5fd31632be07539997e7c27
+#+libressl.2b5f0a530f0b908ffa754aa61f8af9eb4b0a080b5e1f61dd5e9d4c419378e75f
+#+zstd.aeef72ab58744bf8c5b5661a85d359e1bf6182afed993b816f7083fa50b71f22
+#+pkgconf-pkg-config.921512d4a6b33d0c4726be0d87f5fa43cae8c53c8ecddd8d929640f446052f29
 #@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,35 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+skalibs.6929b509ca7d734b3cf1f220c54f1c48be8a50db1ce6fa9d4497244a98093a1f
-#+libcap.137a0116b41ce8675968d0e8a5609294a4ba062dc1812abc56eb56dd129b23f7
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+skalibs.31a94e18a4f70eaca8b4606d3c6d1c9bc1719feb2e59d0509f07f57e5bf1cae6
+#+libcap.e249982965b9c03c69588f47cb3b0147ae3b8b4449bc4ca58eae16d549740381
 #@sha256:818a5ad7061ab1a740a5c2e7d7d8cdcc7be7e84e3f04b479731cf94ff1f1d093:applyuidgid-caps.c
 
 
diff --git a/variants/root-x86_64/argp-standalone b/variants/root-x86_64/argp-standalone
@@ -1,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+m4.af48d2213e4e0ee0f8ff27ab0d1a06593e86fbd0ad9e78c28f02df40e0769195
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+m4.d24f6161a9cf65301c5ac356fd6f3009fe2fa2d3a3fd7e30b07f03cdf5874364
 #@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,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+m4.af48d2213e4e0ee0f8ff27ab0d1a06593e86fbd0ad9e78c28f02df40e0769195
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+m4.d24f6161a9cf65301c5ac356fd6f3009fe2fa2d3a3fd7e30b07f03cdf5874364
 #@untar:-z:sha256:39bf67452fa41d0948c2197601053f48b3d78a029389734332a6309a680c6c87:.
 
 
diff --git a/variants/root-x86_64/bison b/variants/root-x86_64/bison
@@ -1,37 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+m4.af48d2213e4e0ee0f8ff27ab0d1a06593e86fbd0ad9e78c28f02df40e0769195
-#+flex.6908c61fe7c161a8e994e1438c02c7e1a45eaf556b85e5da5b9b19af0d824a26
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+m4.d24f6161a9cf65301c5ac356fd6f3009fe2fa2d3a3fd7e30b07f03cdf5874364
+#+flex.551b952e53ccbf2f3813092dd34a257f124285fa613ca496bb8cd2e56453d400
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
 
diff --git a/variants/root-x86_64/busybox b/variants/root-x86_64/busybox
@@ -1,5 +1,7 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
 #+gnu-make.3bf13b906d934aba6aab1bfa4cce7e2b6d42237210aaad5838dfa892b0fa6a65
 #+busybox.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
 #@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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
 
 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.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+certdata2pem.f95c461ae2de91bf1bfa710d5a12af2a7956e7666ebf5e107cd60707241d12ed
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+certdata2pem.23513cb83073f116ba57c0ab3e3b8c1222c5853fe92e7d54c9fd5f50bb37933b
 #@untar:-j:sha256:6ef7bc56cc0e0b307d99a3c494119686091cc1d4ad08986d68aa089dd00c7788:.
 
 
diff --git a/variants/root-x86_64/ccx-utils b/variants/root-x86_64/ccx-utils
@@ -1,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+skalibs.6929b509ca7d734b3cf1f220c54f1c48be8a50db1ce6fa9d4497244a98093a1f
-#+s6.ac4efadb8805a00cf42335a8265c4f23d1f607bd020040c51e2123db2e4a513e
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+skalibs.31a94e18a4f70eaca8b4606d3c6d1c9bc1719feb2e59d0509f07f57e5bf1cae6
+#+s6.6930a30fdf52463ee0427111ce0a5d0363c8620f9d72aeb8da17d2c1e4bd655e
 #@git:461a9ec198c1e2b9c39a34e21786747dbb8671b4:ccx-utils
 
 
diff --git a/variants/root-x86_64/certdata2pem b/variants/root-x86_64/certdata2pem
@@ -1,33 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
 #@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.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+zsh.782bc6b39d4d5bdb5d869ae7854258affe53f637ba226431c7f728ea0734fd6c
-#+pthbs-banginstall.53ae4b7e39b904f1d4bc5ffc74ad321b72640e17a03d9ca9542ac815d18db241
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+zsh.3cfc27ae8f891aaae6d39ecb2634464105283d343f64ef141d045986afff6a81
+#+pthbs-banginstall.fc0afb8645b68b930e3cd4ec043ae7d36108814c1e73a3ae56f29bb50fd8b3d7
 #@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.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-dosfstools.7011462e09412e95a131c7f17f781dc52a3d09ef98c3f16229cdda54367ff61d
-#+busybox-e2fsprogs.194431ad54edfd1ae6521451ad25944dd7b57c5a36be6fa844ebf897a482cb61
-#+busybox-iproute2.5b2a9e4b76c36ace2bbc85850fe25672d1e6ab43f6484728f072e5a2359146a6
-#+busybox-iputils.dbce8e6244a6d452b9467b468afdac800f5784e72c0faa4bd18e07f558983fd5
-#+busybox-net-misc.2ec61099e29c68e91df653e1c65f9268818b03b0b8d92fa84c85242bdf1e2543
-#+busybox-net-tools.8483788838f5f0e867fef10a411c47b81b4132ac16b9056e8ca85fd62d46f414
-#+busybox-traceroute.980ea04b05aa2270e601796bbd09ca517e9be4f248cd78b82f74f35d95f6acdc
-#+busybox-wget.b60a369f03f0abb8d3fcea52ab5e25465ddcb9d115afbae7d2782ea570acb8fc
-#+busybox-chpst.72d02280fa7f73b40fe1375bfd7a1827cc11e7c7a2551ada5b941b3dee3bf0fe
-#+busybox-console.3edef124d80e9f5d3b5017d05e4082e66fe0a126600305874d109a8bcd118c04
-#+busybox-getty.df935270a9a1c79c6575f4b0f11360f0d49371e475a881b7cb017aff63b42100
-#+busybox-i2c-tools.b24b0180bd00e9a26a2f45aad5b6fa488d21f3c501d07a16abcc00a0d07b0e9b
-#+busybox-linux-extra.2e9531ad95ad77c76713a26c4fd59d051a0eee0025fdedc7c109ab3d0c6ce4b6
-#+busybox-mtd-utils.5c0bce71a682337745bc7bb97d748a641ea5da0b57d8991fba75b0af3be6f39f
-#+busybox-shadow.5e8d9e6a3fadec78509604bbb6c648b77ccfa9e7bfa79f4e8ff3560d580e007b
-#+busybox-su.527f28a9c3e0f3563f7b0ba19c676b6c6ff41522b0dd7904329c086b7ff63d91
-#+busybox-util-linux-priv.98ad14c06bf3244ef05b08f4fa1bad408bd3cdd379e48465bd154eff1528967c
-#+busybox-logging.a04eef102414e27b9e72808dd3db5407b5be110b354371fe5f9714c3e3cc5a92
-#+busybox-cron.f4358813bdc4ede101b874bfcfe6329f2cb6ef71c82517c0c14f3dc8be05bd97
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-login.37f0435c72de4e80eacb24726a51cc746118c217ec13fcac5eb155154b387fe4
-#+execline.8d78e097de88d6a9c16c60a637c8d3e895ef0fdd1dc80629388de6e69436bab7
-#+s6.ac4efadb8805a00cf42335a8265c4f23d1f607bd020040c51e2123db2e4a513e
-#+ccx-utils.467a4a4c8eb649a44e80d08515a4716d2c2a63a3e518b148fa9be6ff6d378551
-#+applyuidgid-caps.28e02ab4f45362b4c80fe8d9b96926554966e2516a0cffbe8819cf83554f1b66
-#+easyseccomp.35fad9c972977bd0eec5985dec606f609b7dbbd99f08c26cd030720469a62526
-#+mlog.cfe65ee50f6180e9d6ff7423d065920847a48ded07751ad2c4d63135652e5cbb
-#+abduco.3752bead38e4b1dc3d681c8664d3b47890ae151d92ec74d8658fea9e176bb1da
-#+nawk.b0b6f48e51cd2df5f27bbb8a4245bc1ba62894d23ef7709964f31cba2bbe4151
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-dosfstools.8758f98dd85943c48023b5fd5c5513a4851e002a2b3fe37799a5241ab1702f8b
+#+busybox-e2fsprogs.ba82e7ebcc9eaa83f50f89977152852525e749e581e71bb4a88e00e4928cb938
+#+busybox-iproute2.0ca0f46ff9151739aab5481c033c709fde6731618d2d337d92ecfb4618809386
+#+busybox-iputils.e011442498a620faeede6ed14adbf989746bd41ef5f2e0f87a3da0d7b0a877ec
+#+busybox-net-misc.c87f729a2573e4a84276b1dad0267a760133dce6bbe6b622ba171511f0984b31
+#+busybox-net-tools.c9b803918ba6541c9739702e16deaccca321189fc6fa32b58c13b45586371149
+#+busybox-traceroute.a28632aebe43fa2c7a81159b61fd84a3b140af07358304a74fda39d03be603db
+#+busybox-wget.2789f0f9e645fd20dfa57b7f6e2e183bb35dd3f548a0d8b908eaa6ca5cafad8f
+#+busybox-chpst.7a9d7a09935bab1a8b45a4428447a0abf8f8442eb7684600a83cd8cb0e216d7e
+#+busybox-console.facfbf29d559911533c847d9ebb25c24b888d1d854851ab5ec48fa21d61243c9
+#+busybox-getty.9838fc958f77e2e4e63c3c733bfa10a1b64a77baa0438324fc198a474cfacb33
+#+busybox-i2c-tools.4aa47a0a9f1e51aad96e0dcb52a5a559fa020e1bd5a9f8c49e844befe9176021
+#+busybox-linux-extra.8b365c5ee585314340ac35dfb3f7e700d2b966f12fc0bd4e80fca4326178a552
+#+busybox-mtd-utils.d49501b56438b14de5b8e505481bb4dc4fb7aca9781abb9ab9a88e484c881268
+#+busybox-shadow.2b4b66ce1941b10f6d951a338d45478558d1bb5114ff0860ef8bbf73f3fa5fb8
+#+busybox-su.063b7d82a85754dce5d87df9a74c5b267757fed08bba946cb0ada74d841c67dd
+#+busybox-util-linux-priv.9ad06562263ec79c267764340bec0a70037d06a8dbebde8c737062ee5b302c0a
+#+busybox-logging.9ccceb95e0b3543025d5b03d124143825b9aec849b043daa72dee6389492ef91
+#+busybox-cron.5945e934c750c1ad56ded4f666ea6f03229f8d405d6dd21505b93fe066cec863
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-login.1ce73fac9bf8cfe431d32b23aad3a28b6dadef725b8100d292559ceeb16d5104
+#+execline.0e1c445b7c9826013666afe1fd462c5ed887f4c77510aa963e5a6bed41d61dea
+#+s6.6930a30fdf52463ee0427111ce0a5d0363c8620f9d72aeb8da17d2c1e4bd655e
+#+ccx-utils.751c4fd33391452950426c1438e5bc2865aa0cf5febf85ce980369f05d64ff08
+#+applyuidgid-caps.0b2c9ae2da57f24fac9256e16cb51a6c3c325ed1ca1235bbf94201ff8fc27184
+#+easyseccomp.890061d3c9471a33c934ed03deb13b90516dda6ef5fd81ac001825f5f8e089e6
+#+mlog.2fcb48e3b1c82b636ae650b7b43c71359e8cb5a93d4a8dc40bd1c7b4a67fe42d
+#+abduco.f33064f4854b1a5df6c65ede944910bada2ad584765634ffa2382241b54a3620
+#+nawk.d9e6772ebef80f34954ebc259423456d3262d5dd18eb8d0a4370a754ed3d507e
 #@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.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+zsh.782bc6b39d4d5bdb5d869ae7854258affe53f637ba226431c7f728ea0734fd6c
-#+pthbs-banginstall.53ae4b7e39b904f1d4bc5ffc74ad321b72640e17a03d9ca9542ac815d18db241
-#+execline.8d78e097de88d6a9c16c60a637c8d3e895ef0fdd1dc80629388de6e69436bab7
-#+alpine-keys.aa959bdbc6c22be5b0b7651e91c8c2ecbbfed4d4df5b073c6e9ca609fecee8fa
-#+apk-tools.f7f5741f228aaaea1f939d588d6d6ee0992a053a24d3566acf75ef96ba3f2ab1
-#+xbps.c0a01fae4e3afaf53e662fce7c078459e20ce7508714ee1660889ebf8d914a7e
-#+container-bin-image.0ff8c056d4fcfd61457358d1cbd75247c5b05a53b7c2531c062c765e0e48a13b
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+zsh.3cfc27ae8f891aaae6d39ecb2634464105283d343f64ef141d045986afff6a81
+#+pthbs-banginstall.fc0afb8645b68b930e3cd4ec043ae7d36108814c1e73a3ae56f29bb50fd8b3d7
+#+execline.0e1c445b7c9826013666afe1fd462c5ed887f4c77510aa963e5a6bed41d61dea
+#+alpine-keys.ba8c0e1d86a03906f8601278cb253222a5527cb5559dee0c830fa5a82ece238b
+#+apk-tools.bb4a0c78d2c2c4f4f7eb3101f1f5e360dad7cdd1a9b35288164eed807b339f1b
+#+xbps.de057c379b2c3459b5fdf56bc1a771cbf2cb4d8239fe0e4d4bb1c2c6f5e953a1
+#+container-bin-image.eb3e44340b64b44c3845b48753919324c125d285800428a770375f3c8792427f
 #@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.f7f5741f228aaaea1f939d588d6d6ee0992a053a24d3566acf75ef96ba3f2ab1/command/apk.static' "${dest}/deps/command/"
-ln -sf '/versions/xbps.c0a01fae4e3afaf53e662fce7c078459e20ce7508714ee1660889ebf8d914a7e/command/xbps-install.static' "${dest}/deps/command/"
+ln -sf '/versions/apk-tools.bb4a0c78d2c2c4f4f7eb3101f1f5e360dad7cdd1a9b35288164eed807b339f1b/command/apk.static' "${dest}/deps/command/"
+ln -sf '/versions/xbps.de057c379b2c3459b5fdf56bc1a771cbf2cb4d8239fe0e4d4bb1c2c6f5e953a1/command/xbps-install.static' "${dest}/deps/command/"
 
-for f in '/versions/alpine-keys.aa959bdbc6c22be5b0b7651e91c8c2ecbbfed4d4df5b073c6e9ca609fecee8fa'/keys/alpine/*/*; do
+for f in '/versions/alpine-keys.ba8c0e1d86a03906f8601278cb253222a5527cb5559dee0c830fa5a82ece238b'/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.aa959bdbc6c22be5b0b7651e91c8c2ecbbfed4d4df5b073c
 done
  
 mkdir -p "${dest}/deps/keys/void"
-for f in '/versions/xbps.c0a01fae4e3afaf53e662fce7c078459e20ce7508714ee1660889ebf8d914a7e'/keys/void/*; do
+for f in '/versions/xbps.de057c379b2c3459b5fdf56bc1a771cbf2cb4d8239fe0e4d4bb1c2c6f5e953a1'/keys/void/*; do
 	ln -sf "$f" "${dest}/deps/keys/void/"
 done
 
-test -d '/versions/container-bin-image.0ff8c056d4fcfd61457358d1cbd75247c5b05a53b7c2531c062c765e0e48a13b/container-bin-image'
-test -f '/versions/container-bin-image.0ff8c056d4fcfd61457358d1cbd75247c5b05a53b7c2531c062c765e0e48a13b/container-bin-image/if'
-ln -sf '/versions/container-bin-image.0ff8c056d4fcfd61457358d1cbd75247c5b05a53b7c2531c062c765e0e48a13b/container-bin-image' "${dest}/deps/"
+test -d '/versions/container-bin-image.eb3e44340b64b44c3845b48753919324c125d285800428a770375f3c8792427f/container-bin-image'
+test -f '/versions/container-bin-image.eb3e44340b64b44c3845b48753919324c125d285800428a770375f3c8792427f/container-bin-image/if'
+ln -sf '/versions/container-bin-image.eb3e44340b64b44c3845b48753919324c125d285800428a770375f3c8792427f/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.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-dosfstools.7011462e09412e95a131c7f17f781dc52a3d09ef98c3f16229cdda54367ff61d
-#+busybox-e2fsprogs.194431ad54edfd1ae6521451ad25944dd7b57c5a36be6fa844ebf897a482cb61
-#+busybox-iproute2.5b2a9e4b76c36ace2bbc85850fe25672d1e6ab43f6484728f072e5a2359146a6
-#+busybox-iputils.dbce8e6244a6d452b9467b468afdac800f5784e72c0faa4bd18e07f558983fd5
-#+busybox-net-misc.2ec61099e29c68e91df653e1c65f9268818b03b0b8d92fa84c85242bdf1e2543
-#+busybox-net-tools.8483788838f5f0e867fef10a411c47b81b4132ac16b9056e8ca85fd62d46f414
-#+busybox-traceroute.980ea04b05aa2270e601796bbd09ca517e9be4f248cd78b82f74f35d95f6acdc
-#+busybox-wget.b60a369f03f0abb8d3fcea52ab5e25465ddcb9d115afbae7d2782ea570acb8fc
-#+busybox-chpst.72d02280fa7f73b40fe1375bfd7a1827cc11e7c7a2551ada5b941b3dee3bf0fe
-#+busybox-console.3edef124d80e9f5d3b5017d05e4082e66fe0a126600305874d109a8bcd118c04
-#+busybox-getty.df935270a9a1c79c6575f4b0f11360f0d49371e475a881b7cb017aff63b42100
-#+busybox-i2c-tools.b24b0180bd00e9a26a2f45aad5b6fa488d21f3c501d07a16abcc00a0d07b0e9b
-#+busybox-linux-extra.2e9531ad95ad77c76713a26c4fd59d051a0eee0025fdedc7c109ab3d0c6ce4b6
-#+busybox-mtd-utils.5c0bce71a682337745bc7bb97d748a641ea5da0b57d8991fba75b0af3be6f39f
-#+busybox-shadow.5e8d9e6a3fadec78509604bbb6c648b77ccfa9e7bfa79f4e8ff3560d580e007b
-#+busybox-su.527f28a9c3e0f3563f7b0ba19c676b6c6ff41522b0dd7904329c086b7ff63d91
-#+busybox-util-linux-priv.98ad14c06bf3244ef05b08f4fa1bad408bd3cdd379e48465bd154eff1528967c
-#+busybox-logging.a04eef102414e27b9e72808dd3db5407b5be110b354371fe5f9714c3e3cc5a92
-#+busybox-cron.f4358813bdc4ede101b874bfcfe6329f2cb6ef71c82517c0c14f3dc8be05bd97
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+execline.8d78e097de88d6a9c16c60a637c8d3e895ef0fdd1dc80629388de6e69436bab7
-#+s6.ac4efadb8805a00cf42335a8265c4f23d1f607bd020040c51e2123db2e4a513e
-#+s6-portable-utils.40caf4adf71f62a7a5bd027d822e4030f696e62187f81f274a10d1f806637988
-#+s6-linux-utils.c27db4183821bb896addb561679ab38a58df43af373b0bb00f964de2ca5c8afe
-#+zsh.782bc6b39d4d5bdb5d869ae7854258affe53f637ba226431c7f728ea0734fd6c
-#+confz.76beee334a5b34b75462769141e3473fdaf1af65174d28a870350da7356dcc95
-#+containers.2477d39b35528be55fd68ecc9b4dddd27440fd2f93abfd64b7d61addf0a42c2c
-#+xbps.c0a01fae4e3afaf53e662fce7c078459e20ce7508714ee1660889ebf8d914a7e
-#+zstd.0bf21a672f99cc391d6b28c9f6872f82b4d1409b2cff1fb3e149fa6b8266a3f8
-#+apk-tools.f7f5741f228aaaea1f939d588d6d6ee0992a053a24d3566acf75ef96ba3f2ab1
-#+alpine-keys.aa959bdbc6c22be5b0b7651e91c8c2ecbbfed4d4df5b073c6e9ca609fecee8fa
-#+getent.2b9aefd6dc2cac1bcfe11ae508a59ea0a2f2cc0dc2277d73c24cb855ba21631e
-#+fileset.caa093c948c3d67f082802e7358e9804cc1ba55935954795989c3a89d20a68e1
-#+ccx-utils.467a4a4c8eb649a44e80d08515a4716d2c2a63a3e518b148fa9be6ff6d378551
-#+easyseccomp.35fad9c972977bd0eec5985dec606f609b7dbbd99f08c26cd030720469a62526
-#+findutils.3b76b6f5ace1499bfeeaa28bd8e1e999b3c47b26de613ea10314ab02109fef9d
-#+nawk.b0b6f48e51cd2df5f27bbb8a4245bc1ba62894d23ef7709964f31cba2bbe4151-
\ No newline at end of file
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-dosfstools.8758f98dd85943c48023b5fd5c5513a4851e002a2b3fe37799a5241ab1702f8b
+#+busybox-e2fsprogs.ba82e7ebcc9eaa83f50f89977152852525e749e581e71bb4a88e00e4928cb938
+#+busybox-iproute2.0ca0f46ff9151739aab5481c033c709fde6731618d2d337d92ecfb4618809386
+#+busybox-iputils.e011442498a620faeede6ed14adbf989746bd41ef5f2e0f87a3da0d7b0a877ec
+#+busybox-net-misc.c87f729a2573e4a84276b1dad0267a760133dce6bbe6b622ba171511f0984b31
+#+busybox-net-tools.c9b803918ba6541c9739702e16deaccca321189fc6fa32b58c13b45586371149
+#+busybox-traceroute.a28632aebe43fa2c7a81159b61fd84a3b140af07358304a74fda39d03be603db
+#+busybox-wget.2789f0f9e645fd20dfa57b7f6e2e183bb35dd3f548a0d8b908eaa6ca5cafad8f
+#+busybox-chpst.7a9d7a09935bab1a8b45a4428447a0abf8f8442eb7684600a83cd8cb0e216d7e
+#+busybox-console.facfbf29d559911533c847d9ebb25c24b888d1d854851ab5ec48fa21d61243c9
+#+busybox-getty.9838fc958f77e2e4e63c3c733bfa10a1b64a77baa0438324fc198a474cfacb33
+#+busybox-i2c-tools.4aa47a0a9f1e51aad96e0dcb52a5a559fa020e1bd5a9f8c49e844befe9176021
+#+busybox-linux-extra.8b365c5ee585314340ac35dfb3f7e700d2b966f12fc0bd4e80fca4326178a552
+#+busybox-mtd-utils.d49501b56438b14de5b8e505481bb4dc4fb7aca9781abb9ab9a88e484c881268
+#+busybox-shadow.2b4b66ce1941b10f6d951a338d45478558d1bb5114ff0860ef8bbf73f3fa5fb8
+#+busybox-su.063b7d82a85754dce5d87df9a74c5b267757fed08bba946cb0ada74d841c67dd
+#+busybox-util-linux-priv.9ad06562263ec79c267764340bec0a70037d06a8dbebde8c737062ee5b302c0a
+#+busybox-logging.9ccceb95e0b3543025d5b03d124143825b9aec849b043daa72dee6389492ef91
+#+busybox-cron.5945e934c750c1ad56ded4f666ea6f03229f8d405d6dd21505b93fe066cec863
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+execline.0e1c445b7c9826013666afe1fd462c5ed887f4c77510aa963e5a6bed41d61dea
+#+s6.6930a30fdf52463ee0427111ce0a5d0363c8620f9d72aeb8da17d2c1e4bd655e
+#+s6-portable-utils.52deaad03a548f5f3c8edd25205e43ae11bedef77fbac891f1e980e2cca04a88
+#+s6-linux-utils.0c364cde97fef6e0070c4fed062ae911e98e073d7be8342997019bb302a36476
+#+zsh.3cfc27ae8f891aaae6d39ecb2634464105283d343f64ef141d045986afff6a81
+#+confz.aee9397510903f0624469d0752e1ebd084510b6055e858521b31155dd12b6984
+#+containers.4cb1840c8d2f213dfcea6e9b7772838dd4b5936e813176b35c4f53b257a1b258
+#+xbps.de057c379b2c3459b5fdf56bc1a771cbf2cb4d8239fe0e4d4bb1c2c6f5e953a1
+#+zstd.aeef72ab58744bf8c5b5661a85d359e1bf6182afed993b816f7083fa50b71f22
+#+apk-tools.bb4a0c78d2c2c4f4f7eb3101f1f5e360dad7cdd1a9b35288164eed807b339f1b
+#+alpine-keys.ba8c0e1d86a03906f8601278cb253222a5527cb5559dee0c830fa5a82ece238b
+#+getent.e71234ea42d32d1bf266247903a928736abf60856803ceb63470c4d3e0121f37
+#+fileset.9a912b4ffa049a0e1e6a7991dc8f0a6076c660ce35c262065973fd811f0c60e2
+#+ccx-utils.751c4fd33391452950426c1438e5bc2865aa0cf5febf85ce980369f05d64ff08
+#+easyseccomp.890061d3c9471a33c934ed03deb13b90516dda6ef5fd81ac001825f5f8e089e6
+#+findutils.e7a23ee4e23d84aeecb3712512ca7e100fde792af5cc52e511a56d262f55f463
+#+nawk.d9e6772ebef80f34954ebc259423456d3262d5dd18eb8d0a4370a754ed3d507e+
\ No newline at end of file
diff --git a/variants/root-x86_64/curl b/variants/root-x86_64/curl
@@ -1,37 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+m4.af48d2213e4e0ee0f8ff27ab0d1a06593e86fbd0ad9e78c28f02df40e0769195
-#+libressl.ebb087f0e9b957025a9d9ee630fcc9cdc87fbf381ba272aecef55a89a91dbae3
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+m4.d24f6161a9cf65301c5ac356fd6f3009fe2fa2d3a3fd7e30b07f03cdf5874364
+#+libressl.2b5f0a530f0b908ffa754aa61f8af9eb4b0a080b5e1f61dd5e9d4c419378e75f
 #@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:.
 
 
diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment
@@ -1,96 +1,98 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-dosfstools.7011462e09412e95a131c7f17f781dc52a3d09ef98c3f16229cdda54367ff61d
-#+busybox-e2fsprogs.194431ad54edfd1ae6521451ad25944dd7b57c5a36be6fa844ebf897a482cb61
-#+busybox-iproute2.5b2a9e4b76c36ace2bbc85850fe25672d1e6ab43f6484728f072e5a2359146a6
-#+busybox-iputils.dbce8e6244a6d452b9467b468afdac800f5784e72c0faa4bd18e07f558983fd5
-#+busybox-net-misc.2ec61099e29c68e91df653e1c65f9268818b03b0b8d92fa84c85242bdf1e2543
-#+busybox-net-tools.8483788838f5f0e867fef10a411c47b81b4132ac16b9056e8ca85fd62d46f414
-#+busybox-traceroute.980ea04b05aa2270e601796bbd09ca517e9be4f248cd78b82f74f35d95f6acdc
-#+busybox-wget.b60a369f03f0abb8d3fcea52ab5e25465ddcb9d115afbae7d2782ea570acb8fc
-#+busybox-chpst.72d02280fa7f73b40fe1375bfd7a1827cc11e7c7a2551ada5b941b3dee3bf0fe
-#+busybox-console.3edef124d80e9f5d3b5017d05e4082e66fe0a126600305874d109a8bcd118c04
-#+busybox-getty.df935270a9a1c79c6575f4b0f11360f0d49371e475a881b7cb017aff63b42100
-#+busybox-i2c-tools.b24b0180bd00e9a26a2f45aad5b6fa488d21f3c501d07a16abcc00a0d07b0e9b
-#+busybox-linux-extra.2e9531ad95ad77c76713a26c4fd59d051a0eee0025fdedc7c109ab3d0c6ce4b6
-#+busybox-mtd-utils.5c0bce71a682337745bc7bb97d748a641ea5da0b57d8991fba75b0af3be6f39f
-#+busybox-shadow.5e8d9e6a3fadec78509604bbb6c648b77ccfa9e7bfa79f4e8ff3560d580e007b
-#+busybox-su.527f28a9c3e0f3563f7b0ba19c676b6c6ff41522b0dd7904329c086b7ff63d91
-#+busybox-util-linux-priv.98ad14c06bf3244ef05b08f4fa1bad408bd3cdd379e48465bd154eff1528967c
-#+busybox-logging.a04eef102414e27b9e72808dd3db5407b5be110b354371fe5f9714c3e3cc5a92
-#+busybox-cron.f4358813bdc4ede101b874bfcfe6329f2cb6ef71c82517c0c14f3dc8be05bd97
-#+attr.6af8a052abaec26cb2a08044eb5b35a8d994a0641b749b9d6517eaf57b944022
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+diffutils.202d28c6f743dfa95cfbd83a53839ce4202a7b5d8ee80a6d83d0091361f94261
-#+patch.076d4ff4c78d93a698eb69b9bcf0c1ec0db1711016608ca949404f4ca6a3bc15
-#+flex.6908c61fe7c161a8e994e1438c02c7e1a45eaf556b85e5da5b9b19af0d824a26
-#+bison.18d45c14bbdaffcf1fe22f7faec2de087ec4ef6ad2360124c7309124cf3c7246
-#+rsync.56f119107bf2c2014d84c4df7541d34d371558a809845b2c71d2c0be5af07f76
-#+execline.8d78e097de88d6a9c16c60a637c8d3e895ef0fdd1dc80629388de6e69436bab7
-#+s6.ac4efadb8805a00cf42335a8265c4f23d1f607bd020040c51e2123db2e4a513e
-#+s6-rc.307ca876ff37f53e2d434e5ac7e73fcd8b7d8ed81a3515d3600700cef30084b1
-#+s6-portable-utils.40caf4adf71f62a7a5bd027d822e4030f696e62187f81f274a10d1f806637988
-#+s6-linux-utils.c27db4183821bb896addb561679ab38a58df43af373b0bb00f964de2ca5c8afe
-#+s6-linux-init.f104ecaaf5cb616d85b9ebe959b4566fd50542dd57d380fb5893898f72b66a4a
-#+mdevd.cc68834dea3e837ffeb64eb65b3a0e038e49cf43408b7b0354c981a0a9af74b1
-#+s6-dns.4bf935eb034621ab95e4394a807016d1195ec1a885f2375a8917c2cc7608c48d
-#+libressl.ebb087f0e9b957025a9d9ee630fcc9cdc87fbf381ba272aecef55a89a91dbae3
-#+s6-networking.2deaf8ddb2eb1625c4ebf3e693c58434dbb04f7855e824a35bd07ccd130cac3a
-#+zsh.782bc6b39d4d5bdb5d869ae7854258affe53f637ba226431c7f728ea0734fd6c
-#+pthbs-banginstall.53ae4b7e39b904f1d4bc5ffc74ad321b72640e17a03d9ca9542ac815d18db241
-#+aat.d0a7f3f97eac575b8f799abda76b4c099060a8d6d426b23fee5fbe65c8e2bc6a
-#+confz.76beee334a5b34b75462769141e3473fdaf1af65174d28a870350da7356dcc95
-#+containers.2477d39b35528be55fd68ecc9b4dddd27440fd2f93abfd64b7d61addf0a42c2c
-#+fileset.caa093c948c3d67f082802e7358e9804cc1ba55935954795989c3a89d20a68e1
-#+logincaps.1e414d2881c195ac19cfd0312563e783cbb25d9d8769f9353ba4ad4db5c3cb63
-#+snaprep.bd9cf14607b1b770d8cfaa0a7e7b90c4b91367e766b6e61388b19d988c701f4c
-#+curl.27e0d7991efbe8c7cf5665287a93bb83e16a6641fc7407bc3708f877e993dace
-#+git.f76144385243b6d3df20325c67746004e5f353ef455ab117e6fa4d458d922645
-#+xbps.c0a01fae4e3afaf53e662fce7c078459e20ce7508714ee1660889ebf8d914a7e
-#+apk-tools.f7f5741f228aaaea1f939d588d6d6ee0992a053a24d3566acf75ef96ba3f2ab1
-#+getent.2b9aefd6dc2cac1bcfe11ae508a59ea0a2f2cc0dc2277d73c24cb855ba21631e
-#+getconf.09aa492622e13546bffa91c13c46d8b9ba450544d5f79d939804b943a0ed78db
-#+iconv.04acaa8af0dddddc6a7ae951e7a238955acc88b1a81229aa05424df28703261a
-#+libcap.137a0116b41ce8675968d0e8a5609294a4ba062dc1812abc56eb56dd129b23f7
-#+applyuidgid-caps.28e02ab4f45362b4c80fe8d9b96926554966e2516a0cffbe8819cf83554f1b66
-#+ccx-utils.467a4a4c8eb649a44e80d08515a4716d2c2a63a3e518b148fa9be6ff6d378551
-#+user-env.01ec585ea8bb3bc0a120785a14f51e301d39b866f7fb75e55c45a39de03ed79f
-#+strace.3a32d6ff413c9f13494da5688884d3aa3396888bddf2dab9a061404ff8aa4dc3
-#+mlog.cfe65ee50f6180e9d6ff7423d065920847a48ded07751ad2c4d63135652e5cbb
-#+findutils.3b76b6f5ace1499bfeeaa28bd8e1e999b3c47b26de613ea10314ab02109fef9d
-#+nawk.b0b6f48e51cd2df5f27bbb8a4245bc1ba62894d23ef7709964f31cba2bbe4151
-#+squashfs-tools.69ff5750b42d3e1a620a1c8527c3b3e60f975fc25c84abaf5729e90ce57ba050
-#+mandoc.95646e8bb465de0483f33132cc57cbe45b71791a41aa5e34104597a43f01b7cd
-#+tinyssh.7ea9a30d1e5545419776669594d256b71beb324ea5d949465575ee70a3e3359e
-#+system-config.665e72e1082a86bc620edb5cab200b1b71e4e2d6eadfdfea5abbb917000529b1
-#+system-config-rc.0330b5dc0b177f059c8efac9b744e5092efff7a6c9c169d2bc431083786a0ed5
-#+system-config-scripts.30798ea3326e014ebada167f1d252bca1d0d1b6b850b27b46e397387a5bbef25
-#+system-config-init.68ac466ff550897ea4db115881e80333f695f0ef0fbab92d30376aadfebb112b
-#+system-config-zsh.887dcd8414bafb746f5010094a5d46c4a971971cb70b165d442d8e0398c1a9a8
-#+busybox-modutils.8c57c4b2519128a862b9a6d9a7149e0f89babc90b6d8cbc10a978a944759e9c7-
\ No newline at end of file
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-dosfstools.8758f98dd85943c48023b5fd5c5513a4851e002a2b3fe37799a5241ab1702f8b
+#+busybox-e2fsprogs.ba82e7ebcc9eaa83f50f89977152852525e749e581e71bb4a88e00e4928cb938
+#+busybox-iproute2.0ca0f46ff9151739aab5481c033c709fde6731618d2d337d92ecfb4618809386
+#+busybox-iputils.e011442498a620faeede6ed14adbf989746bd41ef5f2e0f87a3da0d7b0a877ec
+#+busybox-net-misc.c87f729a2573e4a84276b1dad0267a760133dce6bbe6b622ba171511f0984b31
+#+busybox-net-tools.c9b803918ba6541c9739702e16deaccca321189fc6fa32b58c13b45586371149
+#+busybox-traceroute.a28632aebe43fa2c7a81159b61fd84a3b140af07358304a74fda39d03be603db
+#+busybox-wget.2789f0f9e645fd20dfa57b7f6e2e183bb35dd3f548a0d8b908eaa6ca5cafad8f
+#+busybox-chpst.7a9d7a09935bab1a8b45a4428447a0abf8f8442eb7684600a83cd8cb0e216d7e
+#+busybox-console.facfbf29d559911533c847d9ebb25c24b888d1d854851ab5ec48fa21d61243c9
+#+busybox-getty.9838fc958f77e2e4e63c3c733bfa10a1b64a77baa0438324fc198a474cfacb33
+#+busybox-i2c-tools.4aa47a0a9f1e51aad96e0dcb52a5a559fa020e1bd5a9f8c49e844befe9176021
+#+busybox-linux-extra.8b365c5ee585314340ac35dfb3f7e700d2b966f12fc0bd4e80fca4326178a552
+#+busybox-mtd-utils.d49501b56438b14de5b8e505481bb4dc4fb7aca9781abb9ab9a88e484c881268
+#+busybox-shadow.2b4b66ce1941b10f6d951a338d45478558d1bb5114ff0860ef8bbf73f3fa5fb8
+#+busybox-su.063b7d82a85754dce5d87df9a74c5b267757fed08bba946cb0ada74d841c67dd
+#+busybox-util-linux-priv.9ad06562263ec79c267764340bec0a70037d06a8dbebde8c737062ee5b302c0a
+#+busybox-logging.9ccceb95e0b3543025d5b03d124143825b9aec849b043daa72dee6389492ef91
+#+busybox-cron.5945e934c750c1ad56ded4f666ea6f03229f8d405d6dd21505b93fe066cec863
+#+attr.5f2b64ed46319813fd130218e456cb83f28355db9b589e36ee6202dba6477517
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+diffutils.355c934ff9f3f9cb5aa1d9d82fb91123350dd118e8fe7a6d2827849834d9ad41
+#+patch.8ffbd0650e4352e1a62422cdc213249df8720035c5fd31632be07539997e7c27
+#+flex.551b952e53ccbf2f3813092dd34a257f124285fa613ca496bb8cd2e56453d400
+#+bison.cde4aca804e398acfd0f7b421f8822f0ea5f332b286b5722866e401a731b2016
+#+rsync.ea6c1c9a15de4bb825c701d87528994755fed38376fdf3f8292bc31fa8d055ee
+#+execline.0e1c445b7c9826013666afe1fd462c5ed887f4c77510aa963e5a6bed41d61dea
+#+s6.6930a30fdf52463ee0427111ce0a5d0363c8620f9d72aeb8da17d2c1e4bd655e
+#+s6-rc.229c92ab8848bd9b0fb8416ea7e8aec3c5c3b461f049e13a531f14a142e27634
+#+s6-portable-utils.52deaad03a548f5f3c8edd25205e43ae11bedef77fbac891f1e980e2cca04a88
+#+s6-linux-utils.0c364cde97fef6e0070c4fed062ae911e98e073d7be8342997019bb302a36476
+#+s6-linux-init.3d521a56335823c378f9028d22c1916c47fb091e72c67725dbee519daf67aa2a
+#+mdevd.9963f50b8caaddc2c87f616dc7fbb6f84864b82206f4a3cc609df2b2b7d9ade8
+#+s6-dns.26a45ab20c89df6b038406d2c151d3f1e7a32fa038fbd942dce85e49a817fec4
+#+libressl.2b5f0a530f0b908ffa754aa61f8af9eb4b0a080b5e1f61dd5e9d4c419378e75f
+#+s6-networking.6fce4b03e3a1a3d7f6b5d8ccd53b15b4b7a58dbc36905cd9300b9f1463f9afa1
+#+zsh.3cfc27ae8f891aaae6d39ecb2634464105283d343f64ef141d045986afff6a81
+#+pthbs-banginstall.fc0afb8645b68b930e3cd4ec043ae7d36108814c1e73a3ae56f29bb50fd8b3d7
+#+aat.6eaf761245becad24e0e6a4b35fe1dbcbb33d1168b9ebba2ae80d52676186463
+#+confz.aee9397510903f0624469d0752e1ebd084510b6055e858521b31155dd12b6984
+#+containers.4cb1840c8d2f213dfcea6e9b7772838dd4b5936e813176b35c4f53b257a1b258
+#+fileset.9a912b4ffa049a0e1e6a7991dc8f0a6076c660ce35c262065973fd811f0c60e2
+#+logincaps.aca7ff0283e34c3aec243c6da9006ec84e413bb67ad50573ca73f11ca3b44f7b
+#+snaprep.51398a30add776578e1b226b224a0b02db03fdeea816120039f10d3eff251b7d
+#+curl.0278b42ba8736000f2c5c7b0874d3d1ac3a7a6bc5d187bc1fe4ba1a3a51fc2f4
+#+git.9d20069a12463ae590c62d06cf09b2b9c00614184e2ba5739cd383ab0f5f05c5
+#+xbps.de057c379b2c3459b5fdf56bc1a771cbf2cb4d8239fe0e4d4bb1c2c6f5e953a1
+#+apk-tools.bb4a0c78d2c2c4f4f7eb3101f1f5e360dad7cdd1a9b35288164eed807b339f1b
+#+getent.e71234ea42d32d1bf266247903a928736abf60856803ceb63470c4d3e0121f37
+#+getconf.f98fe95e85910bb452a3b0ac6dece4b1d19f75ea14b4657f008c0cd1805a919d
+#+iconv.41a3368c28f82f39fa16f3dd57fef9ed4313d7add5b89ed9941691d7d3d2f94c
+#+libcap.e249982965b9c03c69588f47cb3b0147ae3b8b4449bc4ca58eae16d549740381
+#+applyuidgid-caps.0b2c9ae2da57f24fac9256e16cb51a6c3c325ed1ca1235bbf94201ff8fc27184
+#+ccx-utils.751c4fd33391452950426c1438e5bc2865aa0cf5febf85ce980369f05d64ff08
+#+user-env.61023cc4489b3d1e3424aeb0cbbbe80d20d5d2789d70db86d6ea60d8eff27d38
+#+strace.b9b217a88126145f83d76895f2abab63a3a8093a7314345c7f70963112a61b4b
+#+mlog.2fcb48e3b1c82b636ae650b7b43c71359e8cb5a93d4a8dc40bd1c7b4a67fe42d
+#+findutils.e7a23ee4e23d84aeecb3712512ca7e100fde792af5cc52e511a56d262f55f463
+#+nawk.d9e6772ebef80f34954ebc259423456d3262d5dd18eb8d0a4370a754ed3d507e
+#+squashfs-tools.4077c781fafda17ae0e788051cb62b03a1cec2743efba08a50663246efe287bc
+#+mandoc.0c979816277590217ddc0e955fd7822a1598218684089287d4f9a271cbd26d70
+#+tinyssh.fef12a201cc09ba23ae5ca30f53837a193f56aec8e35045964344e6471c654df
+#+system-config.f656676a2ceade02bf966e4cead2a5cd1c1c237bcac21693485558c31f84695e
+#+system-config-rc.9c950f34bdb5b8690c462042b85aca5d8a2a4279337eca79cc7632a0ddd2cfc7
+#+system-config-scripts.9db4a08a39b971e88f2eabeeda119e3a604240deeed4d380d26dfc97f3581fcf
+#+system-config-init.fd6ae2bbbb72975f29d9e7324269f57bb71878012513f10b01593bb1686ef74b
+#+system-config-zsh.b513e9cc82b742389c949e9322a8c448b620b6fadeae33fbcbffbf944794dcdb
+#+busybox-modutils.729b8a85de1c715dd9962d9b101299d9e888bd6bf2fd6009e6439c6574e64215+
\ No newline at end of file
diff --git a/variants/root-x86_64/diffutils b/variants/root-x86_64/diffutils
@@ -1,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+m4.af48d2213e4e0ee0f8ff27ab0d1a06593e86fbd0ad9e78c28f02df40e0769195
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+m4.d24f6161a9cf65301c5ac356fd6f3009fe2fa2d3a3fd7e30b07f03cdf5874364
 #@untar:-J:sha256:90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e:.
 
 
diff --git a/variants/root-x86_64/dune b/variants/root-x86_64/dune
@@ -1,35 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+ocaml.846ada9437c16c1f384b5014b8f8bdb27abff6ea4a12602921794bf466ca7951
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+ocaml.8dcf7f7047686887f5656879f070bff57940c6284a53de53d8e11127651ab3de
 #@untar:-z:sha256:579c738f8ca191ba0a9b22dbe78f1377542442c9827cf4939f8964f09f9edb28:.
 
 
@@ -49,7 +51,7 @@ check_dynamic() {
 			printf '%s\n' "Error: '$1' is not a dynamic binary!"
 			exit 1
 			;;
-		(*'/versions/musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/versions/musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
 			return 0
 			;;
 		(*)
diff --git a/variants/root-x86_64/easyseccomp b/variants/root-x86_64/easyseccomp
@@ -1,42 +1,44 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+m4.af48d2213e4e0ee0f8ff27ab0d1a06593e86fbd0ad9e78c28f02df40e0769195
-#+patch.076d4ff4c78d93a698eb69b9bcf0c1ec0db1711016608ca949404f4ca6a3bc15
-#+flex.6908c61fe7c161a8e994e1438c02c7e1a45eaf556b85e5da5b9b19af0d824a26
-#+bison.18d45c14bbdaffcf1fe22f7faec2de087ec4ef6ad2360124c7309124cf3c7246
-#+libseccomp.9f131d8a60c39bd4c1155e7901e7eb5b7c4da2a5e8d0859dd4d4d3eda32fef85
-#+error-standalone.c84fbde5740d8d8e82e3ea5fb9c4387c0b5d3cf21bc8d53ed317391f260f09ae
-#+argp-standalone.52d6ef9e4177a6c8053aadda4cfe58d1cefd529954c15f075d71ab383451425f
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+m4.d24f6161a9cf65301c5ac356fd6f3009fe2fa2d3a3fd7e30b07f03cdf5874364
+#+patch.8ffbd0650e4352e1a62422cdc213249df8720035c5fd31632be07539997e7c27
+#+flex.551b952e53ccbf2f3813092dd34a257f124285fa613ca496bb8cd2e56453d400
+#+bison.cde4aca804e398acfd0f7b421f8822f0ea5f332b286b5722866e401a731b2016
+#+libseccomp.c6f4291e78f250c6e01c32d3bb74779f01722192ea1186460a359cd6bf5fd63d
+#+error-standalone.286463d72c96f372f0af6129807ebcae81896c7823d6b70c0e9fed47fcc9006c
+#+argp-standalone.0c2d83d1b7309ec17a0101915d0e3353f749f6dd4176fef8edc3fe2b21c07881
 #@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,35 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
 #@untar:-z:sha256:0e751989cea94e25d5166a6a1ed9bde218786e39dff82e1f01dff12fc78639d9:.
 
 
diff --git a/variants/root-x86_64/execline b/variants/root-x86_64/execline
@@ -1,35 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+skalibs.6929b509ca7d734b3cf1f220c54f1c48be8a50db1ce6fa9d4497244a98093a1f
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+skalibs.31a94e18a4f70eaca8b4606d3c6d1c9bc1719feb2e59d0509f07f57e5bf1cae6
 #@git:6c0957eb5e8eea2ffada4d7be08286f0e81d0527:execline
 
 
@@ -46,7 +48,7 @@ cd 'execline'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.6929b509ca7d734b3cf1f220c54f1c48be8a50db1ce6fa9d4497244a98093a1f/sysdeps' \
+	--with-sysdeps='/versions/skalibs.31a94e18a4f70eaca8b4606d3c6d1c9bc1719feb2e59d0509f07f57e5bf1cae6/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.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+zsh.782bc6b39d4d5bdb5d869ae7854258affe53f637ba226431c7f728ea0734fd6c
-#+pthbs-banginstall.53ae4b7e39b904f1d4bc5ffc74ad321b72640e17a03d9ca9542ac815d18db241
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+zsh.3cfc27ae8f891aaae6d39ecb2634464105283d343f64ef141d045986afff6a81
+#+pthbs-banginstall.fc0afb8645b68b930e3cd4ec043ae7d36108814c1e73a3ae56f29bb50fd8b3d7
 #@git:1b161b09bc889d17ac0a4ccce2dc3e74b64e1433:fileset
 
 
diff --git a/variants/root-x86_64/findutils b/variants/root-x86_64/findutils
@@ -1,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+m4.af48d2213e4e0ee0f8ff27ab0d1a06593e86fbd0ad9e78c28f02df40e0769195
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+m4.d24f6161a9cf65301c5ac356fd6f3009fe2fa2d3a3fd7e30b07f03cdf5874364
 #@untar:-J:sha256:1387e0b67ff247d2abde998f90dfbf70c1491391a59ddfecb8ae698789f0a4f5:.
 
 
diff --git a/variants/root-x86_64/flex b/variants/root-x86_64/flex
@@ -1,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+m4.af48d2213e4e0ee0f8ff27ab0d1a06593e86fbd0ad9e78c28f02df40e0769195
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+m4.d24f6161a9cf65301c5ac356fd6f3009fe2fa2d3a3fd7e30b07f03cdf5874364
 #@untar:-z:sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995:.
 
 
diff --git a/variants/root-x86_64/gcc b/variants/root-x86_64/gcc
@@ -2,6 +2,11 @@
 #+musl-cross-make.fc96c556cd0441f0bef75ae5ddbcd87d0b9b0a9cc439cf01f1d11f44dc589112
 #+gnu-make.3bf13b906d934aba6aab1bfa4cce7e2b6d42237210aaad5838dfa892b0fa6a65
 #+busybox.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gmp.a939b4258389cf913e5ee7890204ec46497b4e467ad8a34b64d162b5887d0f0c
+#+mpc.5a83ef3b6c4b1ada1fa9ffe45c481757ba86853d5593a009a66e28199e5ee46e
+#+mpfr.6d6af7adedf6be4cd04e1b03c550b98571aaba605968da4df4711a8150d0e284
 #@sha256:62eb68290502d54b16457509aa0c3995a84116408e6b593d676b9f4c03b6b160:merged.patch
 #@untar:-J:sha256:e0dc77297625631ac8e50fa92fffefe899a4eb702592da5c32ef04e2293aca3a:.
 
@@ -79,14 +84,13 @@ make \
 	MAKEINFO=false \
 	MAKE="make MULTILIB_OSDIRNAMES= INFO_DEPS= infodir= ac_cv_prog_lex_root=lex.yy MAKEINFO=false "
 make \
-	MULTILIB_OSDIRNAMES= \
-	INFO_DEPS= \
-	infodir= \
-	ac_cv_prog_lex_root=lex.yy \
-	MAKEINFO=false \
-	AR="$mcm/bin/x86_64-linux-musl-ar "\
-	RANLIB="$mcm/bin/x86_64-linux-musl-ranlib" \
-	DESTDIR="$dest" \
+	'MULTILIB_OSDIRNAMES=' \
+	'INFO_DEPS=' \
+	'infodir=' \
+	'ac_cv_prog_lex_root=lex.yy' \
+	'MAKEINFO=false' \
+	'MAKE=make MULTILIB_OSDIRNAMES= INFO_DEPS= infodir= ac_cv_prog_lex_root=lex.yy MAKEINFO=false ' \
+	"DESTDIR=$dest" \
 	install
 
 
diff --git a/variants/root-x86_64/getconf b/variants/root-x86_64/getconf
@@ -1,33 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
 #@sha256:d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae50e320aad247c:getconf.c
 
 
diff --git a/variants/root-x86_64/getent b/variants/root-x86_64/getent
@@ -1,33 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
 #@sha256:002c1a216f6bed0f816ab1cfebde94a0b127193ef410c36b2190599983e015b8:getent.c
 
 
diff --git a/variants/root-x86_64/git b/variants/root-x86_64/git
@@ -1,38 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+m4.af48d2213e4e0ee0f8ff27ab0d1a06593e86fbd0ad9e78c28f02df40e0769195
-#+libressl.ebb087f0e9b957025a9d9ee630fcc9cdc87fbf381ba272aecef55a89a91dbae3
-#+curl.27e0d7991efbe8c7cf5665287a93bb83e16a6641fc7407bc3708f877e993dace
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+m4.d24f6161a9cf65301c5ac356fd6f3009fe2fa2d3a3fd7e30b07f03cdf5874364
+#+libressl.2b5f0a530f0b908ffa754aa61f8af9eb4b0a080b5e1f61dd5e9d4c419378e75f
+#+curl.0278b42ba8736000f2c5c7b0874d3d1ac3a7a6bc5d187bc1fe4ba1a3a51fc2f4
 #@untar:-J:sha256:f612c1abc63557d50ad3849863fc9109670139fc9901e574460ec76e0511adb9:.
 
 
diff --git a/variants/root-x86_64/gnu-make b/variants/root-x86_64/gnu-make
@@ -1,5 +1,7 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
 #+gnu-make.3bf13b906d934aba6aab1bfa4cce7e2b6d42237210aaad5838dfa892b0fa6a65
 #+busybox.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
diff --git a/variants/root-x86_64/gperf b/variants/root-x86_64/gperf
@@ -1,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+m4.af48d2213e4e0ee0f8ff27ab0d1a06593e86fbd0ad9e78c28f02df40e0769195
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+m4.d24f6161a9cf65301c5ac356fd6f3009fe2fa2d3a3fd7e30b07f03cdf5874364
 #@untar:-z:sha256:588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2:.
 
 
diff --git a/variants/root-x86_64/iconv b/variants/root-x86_64/iconv
@@ -1,33 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
 #@sha256:f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7:iconv.c
 
 
diff --git a/variants/root-x86_64/kbd b/variants/root-x86_64/kbd
@@ -1,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+m4.af48d2213e4e0ee0f8ff27ab0d1a06593e86fbd0ad9e78c28f02df40e0769195
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+m4.d24f6161a9cf65301c5ac356fd6f3009fe2fa2d3a3fd7e30b07f03cdf5874364
 #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:.
 #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:.
 
diff --git a/variants/root-x86_64/libarchive b/variants/root-x86_64/libarchive
@@ -1,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+m4.af48d2213e4e0ee0f8ff27ab0d1a06593e86fbd0ad9e78c28f02df40e0769195
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+m4.d24f6161a9cf65301c5ac356fd6f3009fe2fa2d3a3fd7e30b07f03cdf5874364
 #@untar:-J:sha256:04357661e6717b6941682cde02ad741ae4819c67a260593dfb2431861b251acb:.
 
 
diff --git a/variants/root-x86_64/libbsd b/variants/root-x86_64/libbsd
@@ -1,37 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+m4.af48d2213e4e0ee0f8ff27ab0d1a06593e86fbd0ad9e78c28f02df40e0769195
-#+libmd.ce67b1866bbc01195a6651668ecf595a30f2b9106c87ffe5efa5fe6a60558af0
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+m4.d24f6161a9cf65301c5ac356fd6f3009fe2fa2d3a3fd7e30b07f03cdf5874364
+#+libmd.045389c7d539770c066d695a80c149a57a1892b89a51b4534f5ea347913cec10
 #@untar:-J:sha256:55fdfa2696fb4d55a592fa9ad14a9df897c7b0008ddb3b30c419914841f85f33:.
 
 
diff --git a/variants/root-x86_64/libcap b/variants/root-x86_64/libcap
@@ -1,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+pkgconf-pkg-config.16a3e6160fefe153ceebfea9add030039591396575b042b519213e1c41346ab6
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+pkgconf-pkg-config.921512d4a6b33d0c4726be0d87f5fa43cae8c53c8ecddd8d929640f446052f29
 #@untar:-J:sha256:f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb:.
 
 
diff --git a/variants/root-x86_64/libcgroup b/variants/root-x86_64/libcgroup
@@ -1,39 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+m4.af48d2213e4e0ee0f8ff27ab0d1a06593e86fbd0ad9e78c28f02df40e0769195
-#+flex.6908c61fe7c161a8e994e1438c02c7e1a45eaf556b85e5da5b9b19af0d824a26
-#+bison.18d45c14bbdaffcf1fe22f7faec2de087ec4ef6ad2360124c7309124cf3c7246
-#+musl-fts.99d741ac79aecb5fcf6648c9b5b2fe2d0f9e816587316fbb3d029cf4cb314c4f
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+m4.d24f6161a9cf65301c5ac356fd6f3009fe2fa2d3a3fd7e30b07f03cdf5874364
+#+flex.551b952e53ccbf2f3813092dd34a257f124285fa613ca496bb8cd2e56453d400
+#+bison.cde4aca804e398acfd0f7b421f8822f0ea5f332b286b5722866e401a731b2016
+#+musl-fts.176eaec058c00a0d384a4c68171ba327c3d70626e16a0790f01f831d2812a52c
 #@untar:-z:sha256:8d284d896fca1c981b55850e92acd3ad9648a69227c028dda7ae3402af878edd:.
 
 
diff --git a/variants/root-x86_64/libelf b/variants/root-x86_64/libelf
@@ -1,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+zstd.0bf21a672f99cc391d6b28c9f6872f82b4d1409b2cff1fb3e149fa6b8266a3f8
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+zstd.aeef72ab58744bf8c5b5661a85d359e1bf6182afed993b816f7083fa50b71f22
 #@git:288355d104ff9930520c0283fe82556c6cc5c16f:libelf
 
 
diff --git a/variants/root-x86_64/libmd b/variants/root-x86_64/libmd
@@ -1,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+m4.af48d2213e4e0ee0f8ff27ab0d1a06593e86fbd0ad9e78c28f02df40e0769195
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+m4.d24f6161a9cf65301c5ac356fd6f3009fe2fa2d3a3fd7e30b07f03cdf5874364
 #@untar:-J:sha256:1bd6aa42275313af3141c7cf2e5b964e8b1fd488025caf2f971f43b00776b332:.
 
 
diff --git a/variants/root-x86_64/libressl b/variants/root-x86_64/libressl
@@ -1,37 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+m4.af48d2213e4e0ee0f8ff27ab0d1a06593e86fbd0ad9e78c28f02df40e0769195
-#+ca-certificates-wip-donotuse.b909db013f05e827667b39774bcd5fe46e5f82788a2df2465588c3227d250f52
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+m4.d24f6161a9cf65301c5ac356fd6f3009fe2fa2d3a3fd7e30b07f03cdf5874364
+#+ca-certificates-wip-donotuse.8d423c26ac8fdcaef9930bbb46bc8a20b2f5a22fe7caba10b5617a9d36c266d8
 #@sha256:a68fedc0edd976b9f35ecfdcb252d80dc12084b1bc4e945be7dc42c437d8b540:c_rehash.c
 #@untar:-z:sha256:6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954:.
 
@@ -99,7 +101,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.b909db013f05e827667b39774bcd5fe46e5f82788a2df2465588c3227d250f52/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/"
+cp -vs '/versions/ca-certificates-wip-donotuse.8d423c26ac8fdcaef9930bbb46bc8a20b2f5a22fe7caba10b5617a9d36c266d8/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,38 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+m4.af48d2213e4e0ee0f8ff27ab0d1a06593e86fbd0ad9e78c28f02df40e0769195
-#+pkgconf-pkg-config.16a3e6160fefe153ceebfea9add030039591396575b042b519213e1c41346ab6
-#+gperf.2f6e50adfe0a24c92a548792f6ed86ff46cf09ea2215144b321046c41265f021
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+m4.d24f6161a9cf65301c5ac356fd6f3009fe2fa2d3a3fd7e30b07f03cdf5874364
+#+pkgconf-pkg-config.921512d4a6b33d0c4726be0d87f5fa43cae8c53c8ecddd8d929640f446052f29
+#+gperf.1ca67100bd79a61240a479c35a0cad96ce4f05ca8c1810d47365990970775c4c
 #@untar:-z:sha256:83b6085232d1588c379dc9b9cae47bb37407cf262e6e74993c61ba72d2a784dc:.
 
 
diff --git a/variants/root-x86_64/libunwind b/variants/root-x86_64/libunwind
@@ -1,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+m4.af48d2213e4e0ee0f8ff27ab0d1a06593e86fbd0ad9e78c28f02df40e0769195
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+m4.d24f6161a9cf65301c5ac356fd6f3009fe2fa2d3a3fd7e30b07f03cdf5874364
 #@untar:-z:sha256:ddf0e32dd5fafe5283198d37e4bf9decf7ba1770b6e7e006c33e6df79e6a6157:.
 
 
diff --git a/variants/root-x86_64/linux-qemu-guest b/variants/root-x86_64/linux-qemu-guest
@@ -1,44 +1,46 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nofail_digest
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-modutils.8c57c4b2519128a862b9a6d9a7149e0f89babc90b6d8cbc10a978a944759e9c7
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+findutils.3b76b6f5ace1499bfeeaa28bd8e1e999b3c47b26de613ea10314ab02109fef9d
-#+diffutils.202d28c6f743dfa95cfbd83a53839ce4202a7b5d8ee80a6d83d0091361f94261
-#+patch.076d4ff4c78d93a698eb69b9bcf0c1ec0db1711016608ca949404f4ca6a3bc15
-#+flex.6908c61fe7c161a8e994e1438c02c7e1a45eaf556b85e5da5b9b19af0d824a26
-#+bison.18d45c14bbdaffcf1fe22f7faec2de087ec4ef6ad2360124c7309124cf3c7246
-#+rsync.56f119107bf2c2014d84c4df7541d34d371558a809845b2c71d2c0be5af07f76
-#+zstd.0bf21a672f99cc391d6b28c9f6872f82b4d1409b2cff1fb3e149fa6b8266a3f8
-#+libelf.8ecf277ed64ba4aee5dc2e020c52ac5ae43b923762eb293b27bc7fa67dd7992f
-#+pkgconf-pkg-config.16a3e6160fefe153ceebfea9add030039591396575b042b519213e1c41346ab6
-#+nawk.b0b6f48e51cd2df5f27bbb8a4245bc1ba62894d23ef7709964f31cba2bbe4151
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-modutils.729b8a85de1c715dd9962d9b101299d9e888bd6bf2fd6009e6439c6574e64215
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+findutils.e7a23ee4e23d84aeecb3712512ca7e100fde792af5cc52e511a56d262f55f463
+#+diffutils.355c934ff9f3f9cb5aa1d9d82fb91123350dd118e8fe7a6d2827849834d9ad41
+#+patch.8ffbd0650e4352e1a62422cdc213249df8720035c5fd31632be07539997e7c27
+#+flex.551b952e53ccbf2f3813092dd34a257f124285fa613ca496bb8cd2e56453d400
+#+bison.cde4aca804e398acfd0f7b421f8822f0ea5f332b286b5722866e401a731b2016
+#+rsync.ea6c1c9a15de4bb825c701d87528994755fed38376fdf3f8292bc31fa8d055ee
+#+zstd.aeef72ab58744bf8c5b5661a85d359e1bf6182afed993b816f7083fa50b71f22
+#+libelf.35dec0710e2b9d41a7fb04543cfb0afaf80ec8b9e1c01c8ffc83b30e9fa5f072
+#+pkgconf-pkg-config.921512d4a6b33d0c4726be0d87f5fa43cae8c53c8ecddd8d929640f446052f29
+#+nawk.d9e6772ebef80f34954ebc259423456d3262d5dd18eb8d0a4370a754ed3d507e
 #@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,37 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+zsh.782bc6b39d4d5bdb5d869ae7854258affe53f637ba226431c7f728ea0734fd6c
-#+pthbs-banginstall.53ae4b7e39b904f1d4bc5ffc74ad321b72640e17a03d9ca9542ac815d18db241
-#+execline.8d78e097de88d6a9c16c60a637c8d3e895ef0fdd1dc80629388de6e69436bab7
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+ccx-utils.467a4a4c8eb649a44e80d08515a4716d2c2a63a3e518b148fa9be6ff6d378551
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+zsh.3cfc27ae8f891aaae6d39ecb2634464105283d343f64ef141d045986afff6a81
+#+pthbs-banginstall.fc0afb8645b68b930e3cd4ec043ae7d36108814c1e73a3ae56f29bb50fd8b3d7
+#+execline.0e1c445b7c9826013666afe1fd462c5ed887f4c77510aa963e5a6bed41d61dea
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+ccx-utils.751c4fd33391452950426c1438e5bc2865aa0cf5febf85ce980369f05d64ff08
 #@git:409db79b3e7e5fc6b73305471d9bbb6ac5c14036:logincaps
 
 
diff --git a/variants/root-x86_64/m4 b/variants/root-x86_64/m4
@@ -1,35 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
 #@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:.
 
 
diff --git a/variants/root-x86_64/mandoc b/variants/root-x86_64/mandoc
@@ -1,35 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
 #@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.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+zsh.782bc6b39d4d5bdb5d869ae7854258affe53f637ba226431c7f728ea0734fd6c
-#+pthbs-banginstall.53ae4b7e39b904f1d4bc5ffc74ad321b72640e17a03d9ca9542ac815d18db241
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+zsh.3cfc27ae8f891aaae6d39ecb2634464105283d343f64ef141d045986afff6a81
+#+pthbs-banginstall.fc0afb8645b68b930e3cd4ec043ae7d36108814c1e73a3ae56f29bb50fd8b3d7
 #@git:395634340de8349996fd273b055ae4bac9d2897c:mdev-scripts
 
 
diff --git a/variants/root-x86_64/mdevd b/variants/root-x86_64/mdevd
@@ -1,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+skalibs.6929b509ca7d734b3cf1f220c54f1c48be8a50db1ce6fa9d4497244a98093a1f
-#+execline.8d78e097de88d6a9c16c60a637c8d3e895ef0fdd1dc80629388de6e69436bab7
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+skalibs.31a94e18a4f70eaca8b4606d3c6d1c9bc1719feb2e59d0509f07f57e5bf1cae6
+#+execline.0e1c445b7c9826013666afe1fd462c5ed887f4c77510aa963e5a6bed41d61dea
 #@git:96aef400b9f9d14f3bf54b0e444e9ad3665c4107:mdevd
 
 
@@ -47,7 +49,7 @@ cd 'mdevd'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.6929b509ca7d734b3cf1f220c54f1c48be8a50db1ce6fa9d4497244a98093a1f/sysdeps' \
+	--with-sysdeps='/versions/skalibs.31a94e18a4f70eaca8b4606d3c6d1c9bc1719feb2e59d0509f07f57e5bf1cae6/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.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-dosfstools.7011462e09412e95a131c7f17f781dc52a3d09ef98c3f16229cdda54367ff61d
-#+busybox-e2fsprogs.194431ad54edfd1ae6521451ad25944dd7b57c5a36be6fa844ebf897a482cb61
-#+busybox-iproute2.5b2a9e4b76c36ace2bbc85850fe25672d1e6ab43f6484728f072e5a2359146a6
-#+busybox-iputils.dbce8e6244a6d452b9467b468afdac800f5784e72c0faa4bd18e07f558983fd5
-#+busybox-net-misc.2ec61099e29c68e91df653e1c65f9268818b03b0b8d92fa84c85242bdf1e2543
-#+busybox-net-tools.8483788838f5f0e867fef10a411c47b81b4132ac16b9056e8ca85fd62d46f414
-#+busybox-traceroute.980ea04b05aa2270e601796bbd09ca517e9be4f248cd78b82f74f35d95f6acdc
-#+busybox-wget.b60a369f03f0abb8d3fcea52ab5e25465ddcb9d115afbae7d2782ea570acb8fc
-#+busybox-chpst.72d02280fa7f73b40fe1375bfd7a1827cc11e7c7a2551ada5b941b3dee3bf0fe
-#+busybox-console.3edef124d80e9f5d3b5017d05e4082e66fe0a126600305874d109a8bcd118c04
-#+busybox-getty.df935270a9a1c79c6575f4b0f11360f0d49371e475a881b7cb017aff63b42100
-#+busybox-i2c-tools.b24b0180bd00e9a26a2f45aad5b6fa488d21f3c501d07a16abcc00a0d07b0e9b
-#+busybox-linux-extra.2e9531ad95ad77c76713a26c4fd59d051a0eee0025fdedc7c109ab3d0c6ce4b6
-#+busybox-mtd-utils.5c0bce71a682337745bc7bb97d748a641ea5da0b57d8991fba75b0af3be6f39f
-#+busybox-shadow.5e8d9e6a3fadec78509604bbb6c648b77ccfa9e7bfa79f4e8ff3560d580e007b
-#+busybox-su.527f28a9c3e0f3563f7b0ba19c676b6c6ff41522b0dd7904329c086b7ff63d91
-#+busybox-util-linux-priv.98ad14c06bf3244ef05b08f4fa1bad408bd3cdd379e48465bd154eff1528967c
-#+busybox-logging.a04eef102414e27b9e72808dd3db5407b5be110b354371fe5f9714c3e3cc5a92
-#+busybox-cron.f4358813bdc4ede101b874bfcfe6329f2cb6ef71c82517c0c14f3dc8be05bd97
-#+execline.8d78e097de88d6a9c16c60a637c8d3e895ef0fdd1dc80629388de6e69436bab7
-#+s6.ac4efadb8805a00cf42335a8265c4f23d1f607bd020040c51e2123db2e4a513e
-#+mdev-scripts.689725a3fb5501ec98d6c41b57b8aeec3adbed3f79cc6afdce9451a3fc666244
-#+mdevd.cc68834dea3e837ffeb64eb65b3a0e038e49cf43408b7b0354c981a0a9af74b1
-#+busybox-modutils.8c57c4b2519128a862b9a6d9a7149e0f89babc90b6d8cbc10a978a944759e9c7-
\ No newline at end of file
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-dosfstools.8758f98dd85943c48023b5fd5c5513a4851e002a2b3fe37799a5241ab1702f8b
+#+busybox-e2fsprogs.ba82e7ebcc9eaa83f50f89977152852525e749e581e71bb4a88e00e4928cb938
+#+busybox-iproute2.0ca0f46ff9151739aab5481c033c709fde6731618d2d337d92ecfb4618809386
+#+busybox-iputils.e011442498a620faeede6ed14adbf989746bd41ef5f2e0f87a3da0d7b0a877ec
+#+busybox-net-misc.c87f729a2573e4a84276b1dad0267a760133dce6bbe6b622ba171511f0984b31
+#+busybox-net-tools.c9b803918ba6541c9739702e16deaccca321189fc6fa32b58c13b45586371149
+#+busybox-traceroute.a28632aebe43fa2c7a81159b61fd84a3b140af07358304a74fda39d03be603db
+#+busybox-wget.2789f0f9e645fd20dfa57b7f6e2e183bb35dd3f548a0d8b908eaa6ca5cafad8f
+#+busybox-chpst.7a9d7a09935bab1a8b45a4428447a0abf8f8442eb7684600a83cd8cb0e216d7e
+#+busybox-console.facfbf29d559911533c847d9ebb25c24b888d1d854851ab5ec48fa21d61243c9
+#+busybox-getty.9838fc958f77e2e4e63c3c733bfa10a1b64a77baa0438324fc198a474cfacb33
+#+busybox-i2c-tools.4aa47a0a9f1e51aad96e0dcb52a5a559fa020e1bd5a9f8c49e844befe9176021
+#+busybox-linux-extra.8b365c5ee585314340ac35dfb3f7e700d2b966f12fc0bd4e80fca4326178a552
+#+busybox-mtd-utils.d49501b56438b14de5b8e505481bb4dc4fb7aca9781abb9ab9a88e484c881268
+#+busybox-shadow.2b4b66ce1941b10f6d951a338d45478558d1bb5114ff0860ef8bbf73f3fa5fb8
+#+busybox-su.063b7d82a85754dce5d87df9a74c5b267757fed08bba946cb0ada74d841c67dd
+#+busybox-util-linux-priv.9ad06562263ec79c267764340bec0a70037d06a8dbebde8c737062ee5b302c0a
+#+busybox-logging.9ccceb95e0b3543025d5b03d124143825b9aec849b043daa72dee6389492ef91
+#+busybox-cron.5945e934c750c1ad56ded4f666ea6f03229f8d405d6dd21505b93fe066cec863
+#+execline.0e1c445b7c9826013666afe1fd462c5ed887f4c77510aa963e5a6bed41d61dea
+#+s6.6930a30fdf52463ee0427111ce0a5d0363c8620f9d72aeb8da17d2c1e4bd655e
+#+mdev-scripts.534220be25af5b439d6e0e0d0dc87bb0636a3222dd19b1423d165a7fa3e28b46
+#+mdevd.9963f50b8caaddc2c87f616dc7fbb6f84864b82206f4a3cc609df2b2b7d9ade8
+#+busybox-modutils.729b8a85de1c715dd9962d9b101299d9e888bd6bf2fd6009e6439c6574e64215+
\ No newline at end of file
diff --git a/variants/root-x86_64/mlog b/variants/root-x86_64/mlog
@@ -1,34 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
 #@git:fefc95731f1260810a3551226b73d35f3d6e9d9e:mlog
 
 
diff --git a/variants/root-x86_64/musl-fts b/variants/root-x86_64/musl-fts
@@ -1,34 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
 #@untar:-z:sha256:49ae567a96dbab22823d045ffebe0d6b14b9b799925e9ca9274d47d26ff482a6:.
 
 
diff --git a/variants/root-x86_64/nawk b/variants/root-x86_64/nawk
@@ -1,35 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+bison.18d45c14bbdaffcf1fe22f7faec2de087ec4ef6ad2360124c7309124cf3c7246
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+bison.cde4aca804e398acfd0f7b421f8822f0ea5f332b286b5722866e401a731b2016
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
 #@untar:-z:sha256:e031b1e1d2b230f276f975bffb923f0ea15f798c839d15a3f26a1a39448e32d7:.
 
 
diff --git a/variants/root-x86_64/netbsd-curses b/variants/root-x86_64/netbsd-curses
@@ -1,34 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
 #@git:51d179dad861640caeb76674b5908ccd79f04fae:netbsd-curses
 
 
diff --git a/variants/root-x86_64/ocaml-astring b/variants/root-x86_64/ocaml-astring
@@ -1,39 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+ocaml.846ada9437c16c1f384b5014b8f8bdb27abff6ea4a12602921794bf466ca7951
-#+ocaml-findlib.cf906665a04096c8543d6b015924d20c2c390c2c6806899740881f7b8107687c
-#+ocamlbuild.0cb5acf44423db5c85320a706c4ba57cadf30905b9e048b9a272f9be70533d5a
-#+opam.5428b50e2723116c97c7aebdb03d130eb2357ce04ff058c4f30de2a171ffccaa
-#+ocaml-topkg.f9c2671edce790f86f37316587c145af7d28336958baff1d9ffca44ce8e06ac7
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+ocaml.8dcf7f7047686887f5656879f070bff57940c6284a53de53d8e11127651ab3de
+#+ocaml-findlib.d9fa98d16495f463175aab6e865e2694ba466ef30daa106fac7aa387fe3e2e53
+#+ocamlbuild.7f114ee32667b7febde90a9b52f18c99da510cf596a852b76f0a8d81e5734068
+#+opam.cd24368b7ca66899c175a720979bf106bf7816989a8d3ee4798b16c91be6db74
+#+ocaml-topkg.be24e57ceac20175973801cb1b398165c2a0038eb37826300ad885e01c089d04
 #@untar:-j:sha256:865692630c07c3ab87c66cdfc2734c0fdfc9c34a57f8e89ffec7c7d15e7a70fa:.
 
 
diff --git a/variants/root-x86_64/ocaml-base b/variants/root-x86_64/ocaml-base
@@ -1,38 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+ocaml.846ada9437c16c1f384b5014b8f8bdb27abff6ea4a12602921794bf466ca7951
-#+dune.05f731c84828bf532664b2fde6a57130f64f54421faa6a9dad2a5ee2ad5b4469
-#+ocaml_intrinsics_kernel.5cc73db0e70f979e5beb80223c2cebaac1a4ae241978945b52494a895091f9c6
-#+ocaml-sexplib0.656e0a43caff754ce4acc40085ded55de658c2b91129e814efcb366bb35d0753
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+ocaml.8dcf7f7047686887f5656879f070bff57940c6284a53de53d8e11127651ab3de
+#+dune.38032c4a08a3c4be22220cc0fbd2b8a864b6caced8d8d0bf7d1db5a9c92bc5c1
+#+ocaml_intrinsics_kernel.3123e9d77b7ceb0ce04ff2459789242acb268b4a462eb8ce2e06bd1b7fbcc893
+#+ocaml-sexplib0.eb24d62696d39cc9a133819518beba3ff06b6ef0cc8204e3a0a374696c306241
 #@untar:-z:sha256:3f3f64789ab25bb5cb7f5f907dd651dec9cc9440981822fe75df6b94344b7208:.
 
 
diff --git a/variants/root-x86_64/ocaml-bos b/variants/root-x86_64/ocaml-bos
@@ -1,45 +1,47 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+ocaml.846ada9437c16c1f384b5014b8f8bdb27abff6ea4a12602921794bf466ca7951
-#+ocaml-findlib.cf906665a04096c8543d6b015924d20c2c390c2c6806899740881f7b8107687c
-#+ocamlbuild.0cb5acf44423db5c85320a706c4ba57cadf30905b9e048b9a272f9be70533d5a
-#+opam.5428b50e2723116c97c7aebdb03d130eb2357ce04ff058c4f30de2a171ffccaa
-#+ocaml-topkg.f9c2671edce790f86f37316587c145af7d28336958baff1d9ffca44ce8e06ac7
-#+ocaml-astring.5044f7dd71d8db5b3958c168fc4218f42b75457e4716c28a301bbbfe8bc061b0
-#+ocaml-fpath.e7dc3d045591bfdc8cb66c06f1dcd449ee83bb7ada81fdee6a82cf3c63246d82
-#+ocaml-rresult.19c84c62d5d0cdfc99f7ee81742c4db97bdcf2a72c394c32f1f600c8164216dd
-#+ocaml-fmt.db9879cd6ddbb16ca5a3d3cbff5c3f9bd2946d2e5b96404166d7672c9cc2f53d
-#+ocaml-logs.21c016db4b4f6846c7992b8b172b909671fa9122898a51c709be1ed214db86c6
-#+ocaml-mtime.46bc6c526a070a54a9e01235587e59071bbf0928c594c55af41ec4ba5e9201f5
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+ocaml.8dcf7f7047686887f5656879f070bff57940c6284a53de53d8e11127651ab3de
+#+ocaml-findlib.d9fa98d16495f463175aab6e865e2694ba466ef30daa106fac7aa387fe3e2e53
+#+ocamlbuild.7f114ee32667b7febde90a9b52f18c99da510cf596a852b76f0a8d81e5734068
+#+opam.cd24368b7ca66899c175a720979bf106bf7816989a8d3ee4798b16c91be6db74
+#+ocaml-topkg.be24e57ceac20175973801cb1b398165c2a0038eb37826300ad885e01c089d04
+#+ocaml-astring.4951d216db3ce74e25c241453b0b6ff8a7c2b84f71d5ab5de622f4c09b820e2e
+#+ocaml-fpath.f3a214a9279767bac61d7c0c04da19ca7ac898db531f291f644b9247fb0ef25e
+#+ocaml-rresult.13378a6414edb915a470da1a31f54644e343a3d45018659304089d94d69bdf37
+#+ocaml-fmt.960ed7a087b266de5555cf5a53a21f22d86818c69d51157a8c5a59e9aeb4fb94
+#+ocaml-logs.68a4b921259f05a807de0c4467c3eb28dfc65e462f9a7ad664a2c05f6a801cfb
+#+ocaml-mtime.86abc554a6673e17da20623579fd8a441479bc4fdc41761680d4a6e55db8c8f9
 #@untar:-j:sha256:d8d62e786b10d697e0457205a8eedeaa27ebcc90f1855f18df190cac2e3d8f37:.
 
 
diff --git a/variants/root-x86_64/ocaml-cmdliner b/variants/root-x86_64/ocaml-cmdliner
@@ -1,39 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+ocaml.846ada9437c16c1f384b5014b8f8bdb27abff6ea4a12602921794bf466ca7951
-#+ocaml-findlib.cf906665a04096c8543d6b015924d20c2c390c2c6806899740881f7b8107687c
-#+ocamlbuild.0cb5acf44423db5c85320a706c4ba57cadf30905b9e048b9a272f9be70533d5a
-#+opam.5428b50e2723116c97c7aebdb03d130eb2357ce04ff058c4f30de2a171ffccaa
-#+ocaml-topkg.f9c2671edce790f86f37316587c145af7d28336958baff1d9ffca44ce8e06ac7
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+ocaml.8dcf7f7047686887f5656879f070bff57940c6284a53de53d8e11127651ab3de
+#+ocaml-findlib.d9fa98d16495f463175aab6e865e2694ba466ef30daa106fac7aa387fe3e2e53
+#+ocamlbuild.7f114ee32667b7febde90a9b52f18c99da510cf596a852b76f0a8d81e5734068
+#+opam.cd24368b7ca66899c175a720979bf106bf7816989a8d3ee4798b16c91be6db74
+#+ocaml-topkg.be24e57ceac20175973801cb1b398165c2a0038eb37826300ad885e01c089d04
 #@untar:-j:sha256:4e547a631c36fbaadff60d3bd7724eb3f83ba274e92fb725950bae7868378582:.
 
 
diff --git a/variants/root-x86_64/ocaml-compiler-libs b/variants/root-x86_64/ocaml-compiler-libs
@@ -1,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+ocaml.846ada9437c16c1f384b5014b8f8bdb27abff6ea4a12602921794bf466ca7951
-#+dune.05f731c84828bf532664b2fde6a57130f64f54421faa6a9dad2a5ee2ad5b4469
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+ocaml.8dcf7f7047686887f5656879f070bff57940c6284a53de53d8e11127651ab3de
+#+dune.38032c4a08a3c4be22220cc0fbd2b8a864b6caced8d8d0bf7d1db5a9c92bc5c1
 #@untar:-z:sha256:9b9644d7351db699e57ddba7c767bb4153e6e988ccf45ead2fb238a3bd75cdc7:.
 
 
diff --git a/variants/root-x86_64/ocaml-cppo b/variants/root-x86_64/ocaml-cppo
@@ -1,37 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+ocaml.846ada9437c16c1f384b5014b8f8bdb27abff6ea4a12602921794bf466ca7951
-#+dune.05f731c84828bf532664b2fde6a57130f64f54421faa6a9dad2a5ee2ad5b4469
-#+ocamlbuild.0cb5acf44423db5c85320a706c4ba57cadf30905b9e048b9a272f9be70533d5a
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+ocaml.8dcf7f7047686887f5656879f070bff57940c6284a53de53d8e11127651ab3de
+#+dune.38032c4a08a3c4be22220cc0fbd2b8a864b6caced8d8d0bf7d1db5a9c92bc5c1
+#+ocamlbuild.7f114ee32667b7febde90a9b52f18c99da510cf596a852b76f0a8d81e5734068
 #@untar:-z:sha256:6e62a8ee0217c9cc38d5860110eb18eb8d89c05c420353d298e1431fe8bac00f:.
 
 
diff --git a/variants/root-x86_64/ocaml-findlib b/variants/root-x86_64/ocaml-findlib
@@ -1,39 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+m4.af48d2213e4e0ee0f8ff27ab0d1a06593e86fbd0ad9e78c28f02df40e0769195
-#+netbsd-curses.4a62b90d0698e92686ff508103ea2c8a5396dca5ab8896c357da6363896fb18d
-#+ocaml.846ada9437c16c1f384b5014b8f8bdb27abff6ea4a12602921794bf466ca7951
-#+ocamlbuild.0cb5acf44423db5c85320a706c4ba57cadf30905b9e048b9a272f9be70533d5a
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+m4.d24f6161a9cf65301c5ac356fd6f3009fe2fa2d3a3fd7e30b07f03cdf5874364
+#+netbsd-curses.b548b8886b334b2d3641b491a5d8f2fc4a3eb3cf8fb8b321d7c01b1594790d10
+#+ocaml.8dcf7f7047686887f5656879f070bff57940c6284a53de53d8e11127651ab3de
+#+ocamlbuild.7f114ee32667b7febde90a9b52f18c99da510cf596a852b76f0a8d81e5734068
 #@untar:-z:sha256:662c910f774e9fee3a19c4e057f380581ab2fc4ee52da4761304ac9c31b8869d:.
 
 
@@ -53,7 +55,7 @@ check_dynamic() {
 			printf '%s\n' "Error: '$1' is not a dynamic binary!"
 			exit 1
 			;;
-		(*'/versions/musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/versions/musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
 			return 0
 			;;
 		(*)
@@ -79,7 +81,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.846ada9437c16c1f384b5014b8f8bdb27abff6ea4a12602921794bf466ca7951"
+stdlib="$pthbs_destdir/versions/ocaml.8dcf7f7047686887f5656879f070bff57940c6284a53de53d8e11127651ab3de"
 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,40 +1,42 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+ocaml.846ada9437c16c1f384b5014b8f8bdb27abff6ea4a12602921794bf466ca7951
-#+ocaml-findlib.cf906665a04096c8543d6b015924d20c2c390c2c6806899740881f7b8107687c
-#+ocamlbuild.0cb5acf44423db5c85320a706c4ba57cadf30905b9e048b9a272f9be70533d5a
-#+opam.5428b50e2723116c97c7aebdb03d130eb2357ce04ff058c4f30de2a171ffccaa
-#+ocaml-topkg.f9c2671edce790f86f37316587c145af7d28336958baff1d9ffca44ce8e06ac7
-#+ocaml-cmdliner.c6bbbc3c22dfc246840c1c9efa81ad818a29255aeeaee5e9b33f7e793dba054b
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+ocaml.8dcf7f7047686887f5656879f070bff57940c6284a53de53d8e11127651ab3de
+#+ocaml-findlib.d9fa98d16495f463175aab6e865e2694ba466ef30daa106fac7aa387fe3e2e53
+#+ocamlbuild.7f114ee32667b7febde90a9b52f18c99da510cf596a852b76f0a8d81e5734068
+#+opam.cd24368b7ca66899c175a720979bf106bf7816989a8d3ee4798b16c91be6db74
+#+ocaml-topkg.be24e57ceac20175973801cb1b398165c2a0038eb37826300ad885e01c089d04
+#+ocaml-cmdliner.3a60a32b300f5e74f1cf1b37fa4701996befdd029b8bbc5f287030039187d8d6
 #@untar:-j:sha256:857cfd47a54b52429cd9b3e2665e44173cd1bd3b435bece7172f984ad5376a1b:.
 
 
diff --git a/variants/root-x86_64/ocaml-fpath b/variants/root-x86_64/ocaml-fpath
@@ -1,40 +1,42 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+ocaml.846ada9437c16c1f384b5014b8f8bdb27abff6ea4a12602921794bf466ca7951
-#+ocaml-findlib.cf906665a04096c8543d6b015924d20c2c390c2c6806899740881f7b8107687c
-#+ocamlbuild.0cb5acf44423db5c85320a706c4ba57cadf30905b9e048b9a272f9be70533d5a
-#+opam.5428b50e2723116c97c7aebdb03d130eb2357ce04ff058c4f30de2a171ffccaa
-#+ocaml-topkg.f9c2671edce790f86f37316587c145af7d28336958baff1d9ffca44ce8e06ac7
-#+ocaml-astring.5044f7dd71d8db5b3958c168fc4218f42b75457e4716c28a301bbbfe8bc061b0
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+ocaml.8dcf7f7047686887f5656879f070bff57940c6284a53de53d8e11127651ab3de
+#+ocaml-findlib.d9fa98d16495f463175aab6e865e2694ba466ef30daa106fac7aa387fe3e2e53
+#+ocamlbuild.7f114ee32667b7febde90a9b52f18c99da510cf596a852b76f0a8d81e5734068
+#+opam.cd24368b7ca66899c175a720979bf106bf7816989a8d3ee4798b16c91be6db74
+#+ocaml-topkg.be24e57ceac20175973801cb1b398165c2a0038eb37826300ad885e01c089d04
+#+ocaml-astring.4951d216db3ce74e25c241453b0b6ff8a7c2b84f71d5ab5de622f4c09b820e2e
 #@untar:-j:sha256:12b08ff192d037d9b6d69e9ca19d1d385184f20b3237c27231e437ac81ace70f:.
 
 
diff --git a/variants/root-x86_64/ocaml-logs b/variants/root-x86_64/ocaml-logs
@@ -1,42 +1,44 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+ocaml.846ada9437c16c1f384b5014b8f8bdb27abff6ea4a12602921794bf466ca7951
-#+ocaml-findlib.cf906665a04096c8543d6b015924d20c2c390c2c6806899740881f7b8107687c
-#+ocamlbuild.0cb5acf44423db5c85320a706c4ba57cadf30905b9e048b9a272f9be70533d5a
-#+opam.5428b50e2723116c97c7aebdb03d130eb2357ce04ff058c4f30de2a171ffccaa
-#+ocaml-topkg.f9c2671edce790f86f37316587c145af7d28336958baff1d9ffca44ce8e06ac7
-#+ocaml-mtime.46bc6c526a070a54a9e01235587e59071bbf0928c594c55af41ec4ba5e9201f5
-#+ocaml-cmdliner.c6bbbc3c22dfc246840c1c9efa81ad818a29255aeeaee5e9b33f7e793dba054b
-#+ocaml-fmt.db9879cd6ddbb16ca5a3d3cbff5c3f9bd2946d2e5b96404166d7672c9cc2f53d
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+ocaml.8dcf7f7047686887f5656879f070bff57940c6284a53de53d8e11127651ab3de
+#+ocaml-findlib.d9fa98d16495f463175aab6e865e2694ba466ef30daa106fac7aa387fe3e2e53
+#+ocamlbuild.7f114ee32667b7febde90a9b52f18c99da510cf596a852b76f0a8d81e5734068
+#+opam.cd24368b7ca66899c175a720979bf106bf7816989a8d3ee4798b16c91be6db74
+#+ocaml-topkg.be24e57ceac20175973801cb1b398165c2a0038eb37826300ad885e01c089d04
+#+ocaml-mtime.86abc554a6673e17da20623579fd8a441479bc4fdc41761680d4a6e55db8c8f9
+#+ocaml-cmdliner.3a60a32b300f5e74f1cf1b37fa4701996befdd029b8bbc5f287030039187d8d6
+#+ocaml-fmt.960ed7a087b266de5555cf5a53a21f22d86818c69d51157a8c5a59e9aeb4fb94
 #@untar:-j:sha256:ee97065ba41ce28f19dea9453c6bec4e0ef26165ad7394c4131ea0c65c0f06d5:.
 
 
diff --git a/variants/root-x86_64/ocaml-lun b/variants/root-x86_64/ocaml-lun
@@ -1,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+ocaml.846ada9437c16c1f384b5014b8f8bdb27abff6ea4a12602921794bf466ca7951
-#+dune.05f731c84828bf532664b2fde6a57130f64f54421faa6a9dad2a5ee2ad5b4469
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+ocaml.8dcf7f7047686887f5656879f070bff57940c6284a53de53d8e11127651ab3de
+#+dune.38032c4a08a3c4be22220cc0fbd2b8a864b6caced8d8d0bf7d1db5a9c92bc5c1
 #@untar:-j:sha256:cca8badff83b470fdcfb1840116f8e8a6f2cb86cde2f44ed28cf26cbf692a793:.
 
 
diff --git a/variants/root-x86_64/ocaml-mtime b/variants/root-x86_64/ocaml-mtime
@@ -1,39 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+ocaml.846ada9437c16c1f384b5014b8f8bdb27abff6ea4a12602921794bf466ca7951
-#+ocaml-findlib.cf906665a04096c8543d6b015924d20c2c390c2c6806899740881f7b8107687c
-#+ocamlbuild.0cb5acf44423db5c85320a706c4ba57cadf30905b9e048b9a272f9be70533d5a
-#+opam.5428b50e2723116c97c7aebdb03d130eb2357ce04ff058c4f30de2a171ffccaa
-#+ocaml-topkg.f9c2671edce790f86f37316587c145af7d28336958baff1d9ffca44ce8e06ac7
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+ocaml.8dcf7f7047686887f5656879f070bff57940c6284a53de53d8e11127651ab3de
+#+ocaml-findlib.d9fa98d16495f463175aab6e865e2694ba466ef30daa106fac7aa387fe3e2e53
+#+ocamlbuild.7f114ee32667b7febde90a9b52f18c99da510cf596a852b76f0a8d81e5734068
+#+opam.cd24368b7ca66899c175a720979bf106bf7816989a8d3ee4798b16c91be6db74
+#+ocaml-topkg.be24e57ceac20175973801cb1b398165c2a0038eb37826300ad885e01c089d04
 #@untar:-j:sha256:097cb2802e3701ead9572e1b483d5a28c6e2f0a39449faaf9b44ad8a89834d88:.
 
 
diff --git a/variants/root-x86_64/ocaml-ppx_derivers b/variants/root-x86_64/ocaml-ppx_derivers
@@ -1,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+ocaml.846ada9437c16c1f384b5014b8f8bdb27abff6ea4a12602921794bf466ca7951
-#+dune.05f731c84828bf532664b2fde6a57130f64f54421faa6a9dad2a5ee2ad5b4469
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+ocaml.8dcf7f7047686887f5656879f070bff57940c6284a53de53d8e11127651ab3de
+#+dune.38032c4a08a3c4be22220cc0fbd2b8a864b6caced8d8d0bf7d1db5a9c92bc5c1
 #@untar:-z:sha256:b6595ee187dea792b31fc54a0e1524ab1e48bc6068d3066c45215a138cc73b95:.
 
 
diff --git a/variants/root-x86_64/ocaml-ppx_deriving b/variants/root-x86_64/ocaml-ppx_deriving
@@ -1,43 +1,45 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+ocaml.846ada9437c16c1f384b5014b8f8bdb27abff6ea4a12602921794bf466ca7951
-#+dune.05f731c84828bf532664b2fde6a57130f64f54421faa6a9dad2a5ee2ad5b4469
-#+ocaml-compiler-libs.f5092b1bff0fd327aaec3a6de711fb617ea401855dacff15bd918e04aef75a40
-#+ocaml-cppo.c4bae583febf2a22fd48e6d0499ca2d005f34f27be21aeb1ec79d68b224ed3a7
-#+ocaml-findlib.cf906665a04096c8543d6b015924d20c2c390c2c6806899740881f7b8107687c
-#+ocaml-ppx_derivers.8b9c6a90a6cc4b25598a54c85d72ce560f13dacae73a342d038f0fa32f37691c
-#+ocaml-ppxlib.c66a74f8a134bd6cf2a4ce8ee4b1477f6daa11b72f08e43fecb5ef0d05142cf4
-#+ocaml-sexplib0.656e0a43caff754ce4acc40085ded55de658c2b91129e814efcb366bb35d0753
-#+ocaml-stdlib-shims.8adb037a4a01706aaedd5b308159d984b43ba69eba95ab335e2aad90d027b4ce
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+ocaml.8dcf7f7047686887f5656879f070bff57940c6284a53de53d8e11127651ab3de
+#+dune.38032c4a08a3c4be22220cc0fbd2b8a864b6caced8d8d0bf7d1db5a9c92bc5c1
+#+ocaml-compiler-libs.6b8cb601dd1448da8fd5433d5a418804718e3eb5dfad2aa0a60fdf38f9ea10c2
+#+ocaml-cppo.c0bea7d76bf00fafc6368a770780be54d5bbfca0f348dbbd0b8bac33806b16e1
+#+ocaml-findlib.d9fa98d16495f463175aab6e865e2694ba466ef30daa106fac7aa387fe3e2e53
+#+ocaml-ppx_derivers.83ff68328e7ae5b01acaf33bf00308527cda6d502f2f85114b39663321d74867
+#+ocaml-ppxlib.7a1be94dbe9a525bbbbc87cdec1ddea084c8bf6dc283f664ef288466601ab037
+#+ocaml-sexplib0.eb24d62696d39cc9a133819518beba3ff06b6ef0cc8204e3a0a374696c306241
+#+ocaml-stdlib-shims.a1f4c9a5ef4292cf9eced7e19114e2ae54eb5c74b63a58b46f20977660f13883
 #@untar:-z:sha256:c91d1ea5e15e6928a2f8947dbd135b9f765cc0e2d72be271427981afcd350c24:.
 
 
diff --git a/variants/root-x86_64/ocaml-ppxlib b/variants/root-x86_64/ocaml-ppxlib
@@ -1,40 +1,42 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+ocaml.846ada9437c16c1f384b5014b8f8bdb27abff6ea4a12602921794bf466ca7951
-#+dune.05f731c84828bf532664b2fde6a57130f64f54421faa6a9dad2a5ee2ad5b4469
-#+ocaml-compiler-libs.f5092b1bff0fd327aaec3a6de711fb617ea401855dacff15bd918e04aef75a40
-#+ocaml-ppx_derivers.8b9c6a90a6cc4b25598a54c85d72ce560f13dacae73a342d038f0fa32f37691c
-#+ocaml-sexplib0.656e0a43caff754ce4acc40085ded55de658c2b91129e814efcb366bb35d0753
-#+ocaml-stdlib-shims.8adb037a4a01706aaedd5b308159d984b43ba69eba95ab335e2aad90d027b4ce
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+ocaml.8dcf7f7047686887f5656879f070bff57940c6284a53de53d8e11127651ab3de
+#+dune.38032c4a08a3c4be22220cc0fbd2b8a864b6caced8d8d0bf7d1db5a9c92bc5c1
+#+ocaml-compiler-libs.6b8cb601dd1448da8fd5433d5a418804718e3eb5dfad2aa0a60fdf38f9ea10c2
+#+ocaml-ppx_derivers.83ff68328e7ae5b01acaf33bf00308527cda6d502f2f85114b39663321d74867
+#+ocaml-sexplib0.eb24d62696d39cc9a133819518beba3ff06b6ef0cc8204e3a0a374696c306241
+#+ocaml-stdlib-shims.a1f4c9a5ef4292cf9eced7e19114e2ae54eb5c74b63a58b46f20977660f13883
 #@untar:-j:sha256:2e223837e7cecc3bc84a432432c0a72f4e1d5be9165c9c33772f156db85db0b3:.
 
 
diff --git a/variants/root-x86_64/ocaml-rresult b/variants/root-x86_64/ocaml-rresult
@@ -1,39 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+ocaml.846ada9437c16c1f384b5014b8f8bdb27abff6ea4a12602921794bf466ca7951
-#+ocaml-findlib.cf906665a04096c8543d6b015924d20c2c390c2c6806899740881f7b8107687c
-#+ocamlbuild.0cb5acf44423db5c85320a706c4ba57cadf30905b9e048b9a272f9be70533d5a
-#+opam.5428b50e2723116c97c7aebdb03d130eb2357ce04ff058c4f30de2a171ffccaa
-#+ocaml-topkg.f9c2671edce790f86f37316587c145af7d28336958baff1d9ffca44ce8e06ac7
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+ocaml.8dcf7f7047686887f5656879f070bff57940c6284a53de53d8e11127651ab3de
+#+ocaml-findlib.d9fa98d16495f463175aab6e865e2694ba466ef30daa106fac7aa387fe3e2e53
+#+ocamlbuild.7f114ee32667b7febde90a9b52f18c99da510cf596a852b76f0a8d81e5734068
+#+opam.cd24368b7ca66899c175a720979bf106bf7816989a8d3ee4798b16c91be6db74
+#+ocaml-topkg.be24e57ceac20175973801cb1b398165c2a0038eb37826300ad885e01c089d04
 #@untar:-j:sha256:11aa7f5b83460e60431e3154e3e32c071d46e151ea5760cf24377805bf975540:.
 
 
diff --git a/variants/root-x86_64/ocaml-sexplib0 b/variants/root-x86_64/ocaml-sexplib0
@@ -1,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+ocaml.846ada9437c16c1f384b5014b8f8bdb27abff6ea4a12602921794bf466ca7951
-#+dune.05f731c84828bf532664b2fde6a57130f64f54421faa6a9dad2a5ee2ad5b4469
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+ocaml.8dcf7f7047686887f5656879f070bff57940c6284a53de53d8e11127651ab3de
+#+dune.38032c4a08a3c4be22220cc0fbd2b8a864b6caced8d8d0bf7d1db5a9c92bc5c1
 #@untar:-z:sha256:86dba26468194512f789f2fb709063515a9cb4e5c4461c021c239a369590701d:.
 
 
diff --git a/variants/root-x86_64/ocaml-stdlib-shims b/variants/root-x86_64/ocaml-stdlib-shims
@@ -1,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+ocaml.846ada9437c16c1f384b5014b8f8bdb27abff6ea4a12602921794bf466ca7951
-#+dune.05f731c84828bf532664b2fde6a57130f64f54421faa6a9dad2a5ee2ad5b4469
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+ocaml.8dcf7f7047686887f5656879f070bff57940c6284a53de53d8e11127651ab3de
+#+dune.38032c4a08a3c4be22220cc0fbd2b8a864b6caced8d8d0bf7d1db5a9c92bc5c1
 #@untar:-j:sha256:babf72d3917b86f707885f0c5528e36c63fccb698f4b46cf2bab5c7ccdd6d84a:.
 
 
diff --git a/variants/root-x86_64/ocaml-topkg b/variants/root-x86_64/ocaml-topkg
@@ -1,38 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+ocaml.846ada9437c16c1f384b5014b8f8bdb27abff6ea4a12602921794bf466ca7951
-#+ocaml-findlib.cf906665a04096c8543d6b015924d20c2c390c2c6806899740881f7b8107687c
-#+ocamlbuild.0cb5acf44423db5c85320a706c4ba57cadf30905b9e048b9a272f9be70533d5a
-#+opam.5428b50e2723116c97c7aebdb03d130eb2357ce04ff058c4f30de2a171ffccaa
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+ocaml.8dcf7f7047686887f5656879f070bff57940c6284a53de53d8e11127651ab3de
+#+ocaml-findlib.d9fa98d16495f463175aab6e865e2694ba466ef30daa106fac7aa387fe3e2e53
+#+ocamlbuild.7f114ee32667b7febde90a9b52f18c99da510cf596a852b76f0a8d81e5734068
+#+opam.cd24368b7ca66899c175a720979bf106bf7816989a8d3ee4798b16c91be6db74
 #@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.846ada9437c16c1f384b5014b8f8bdb27abff6ea4a12602921794bf466ca7951
-#+dune.05f731c84828bf532664b2fde6a57130f64f54421faa6a9dad2a5ee2ad5b4469
-#+ocamlbuild.0cb5acf44423db5c85320a706c4ba57cadf30905b9e048b9a272f9be70533d5a
-#+ocaml-base.c6c98fc083ab5eac55b72852ec254953018f34597582a6ea97af4562b481f3f7
-#+opam.5428b50e2723116c97c7aebdb03d130eb2357ce04ff058c4f30de2a171ffccaa
-#+ocaml-bos.241ff0a8852592507318b2eeebeb85dfcf2e42d4aa7929421446c1a7d598ca80
-#+ocaml-lun.a1b3f069dc89bbc82eb251dd5b9759e55ec833c4590b67bb139abdfd3c62dd36
-#+ocaml-ppx_deriving.2b2b3f76fcceb55fef3ed826265f5bb4ea77d97769a0576b9efc8cc302b662f7-
\ No newline at end of file
+#+ocaml.8dcf7f7047686887f5656879f070bff57940c6284a53de53d8e11127651ab3de
+#+dune.38032c4a08a3c4be22220cc0fbd2b8a864b6caced8d8d0bf7d1db5a9c92bc5c1
+#+ocamlbuild.7f114ee32667b7febde90a9b52f18c99da510cf596a852b76f0a8d81e5734068
+#+ocaml-base.9f9297a71293d1ebfc9b2329c01006247e4f27df7ddbfc8f5033722e23a43b2f
+#+opam.cd24368b7ca66899c175a720979bf106bf7816989a8d3ee4798b16c91be6db74
+#+ocaml-bos.57c5625b8b86ad59b8ad962aa51d27300ef2b4a70d5774c9b78451ca8e596a19
+#+ocaml-lun.d1416ae241a931a68a49bd05940bf862bf81026d95b32eb3507befe707cf65d1
+#+ocaml-ppx_deriving.e528337f50cda22e197d6c58e9dff075874c82e6a7b3b787da2902842d070f22+
\ No newline at end of file
diff --git a/variants/root-x86_64/ocaml:dynlink b/variants/root-x86_64/ocaml:dynlink
@@ -1,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+m4.af48d2213e4e0ee0f8ff27ab0d1a06593e86fbd0ad9e78c28f02df40e0769195
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+m4.d24f6161a9cf65301c5ac356fd6f3009fe2fa2d3a3fd7e30b07f03cdf5874364
 #@untar:-J:sha256:dfaa8a2e11c799bc1765d8bef44911406ee5f4803027190382a939f88c912266:.
 
 
diff --git a/variants/root-x86_64/ocaml_intrinsics_kernel b/variants/root-x86_64/ocaml_intrinsics_kernel
@@ -1,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+ocaml.846ada9437c16c1f384b5014b8f8bdb27abff6ea4a12602921794bf466ca7951
-#+dune.05f731c84828bf532664b2fde6a57130f64f54421faa6a9dad2a5ee2ad5b4469
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+ocaml.8dcf7f7047686887f5656879f070bff57940c6284a53de53d8e11127651ab3de
+#+dune.38032c4a08a3c4be22220cc0fbd2b8a864b6caced8d8d0bf7d1db5a9c92bc5c1
 #@untar:-z:sha256:c988b7769a59749631c3c98ba5edd1d2fe91f5dc380b5e0593c073c92f4bee01:.
 
 
diff --git a/variants/root-x86_64/ocamlbuild b/variants/root-x86_64/ocamlbuild
@@ -1,37 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+m4.af48d2213e4e0ee0f8ff27ab0d1a06593e86fbd0ad9e78c28f02df40e0769195
-#+ocaml.846ada9437c16c1f384b5014b8f8bdb27abff6ea4a12602921794bf466ca7951
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+m4.d24f6161a9cf65301c5ac356fd6f3009fe2fa2d3a3fd7e30b07f03cdf5874364
+#+ocaml.8dcf7f7047686887f5656879f070bff57940c6284a53de53d8e11127651ab3de
 #@untar:-z:sha256:2ba6857f2991b7f69368e8db818b163d31cf5a367f15f5953bf8f01a77b3d4fc:.
 
 
@@ -51,7 +53,7 @@ check_dynamic() {
 			printf '%s\n' "Error: '$1' is not a dynamic binary!"
 			exit 1
 			;;
-		(*'/versions/musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/versions/musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
 			return 0
 			;;
 		(*)
@@ -75,7 +77,7 @@ make configure \
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
 # workaround ocamlbuild manpage getting installed to stdlib directory
-stdlib="$pthbs_destdir/versions/ocaml.846ada9437c16c1f384b5014b8f8bdb27abff6ea4a12602921794bf466ca7951"
+stdlib="$pthbs_destdir/versions/ocaml.8dcf7f7047686887f5656879f070bff57940c6284a53de53d8e11127651ab3de"
 mkdir -p "${stdlib%/*}"
 ln -s "$pthbs_package" "$stdlib"
 
diff --git a/variants/root-x86_64/opam b/variants/root-x86_64/opam
@@ -1,39 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+diffutils.202d28c6f743dfa95cfbd83a53839ce4202a7b5d8ee80a6d83d0091361f94261
-#+patch.076d4ff4c78d93a698eb69b9bcf0c1ec0db1711016608ca949404f4ca6a3bc15
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+getconf.09aa492622e13546bffa91c13c46d8b9ba450544d5f79d939804b943a0ed78db
-#+ocaml.846ada9437c16c1f384b5014b8f8bdb27abff6ea4a12602921794bf466ca7951
-#+dune.05f731c84828bf532664b2fde6a57130f64f54421faa6a9dad2a5ee2ad5b4469
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+diffutils.355c934ff9f3f9cb5aa1d9d82fb91123350dd118e8fe7a6d2827849834d9ad41
+#+patch.8ffbd0650e4352e1a62422cdc213249df8720035c5fd31632be07539997e7c27
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+getconf.f98fe95e85910bb452a3b0ac6dece4b1d19f75ea14b4657f008c0cd1805a919d
+#+ocaml.8dcf7f7047686887f5656879f070bff57940c6284a53de53d8e11127651ab3de
+#+dune.38032c4a08a3c4be22220cc0fbd2b8a864b6caced8d8d0bf7d1db5a9c92bc5c1
 #@untar:-z:sha256:c4d053029793c714e4e7340b1157428c0f90783585fb17f35158247a640467d9:.
 
 
@@ -72,7 +74,7 @@ export DUNE_CACHE=disabled
 	--infodir="$prefix/info" \
 	--localedir="$prefix/locale" \
 	--localstatedir='/var/pthbs' \
-	--with-dune='/versions/dune.05f731c84828bf532664b2fde6a57130f64f54421faa6a9dad2a5ee2ad5b4469/command/dune' \
+	--with-dune='/versions/dune.38032c4a08a3c4be22220cc0fbd2b8a864b6caced8d8d0bf7d1db5a9c92bc5c1/command/dune' \
 	--with-mccs \
 	--with-vendored-deps \
 	--enable-static
diff --git a/variants/root-x86_64/patch b/variants/root-x86_64/patch
@@ -1,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+m4.af48d2213e4e0ee0f8ff27ab0d1a06593e86fbd0ad9e78c28f02df40e0769195
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+m4.d24f6161a9cf65301c5ac356fd6f3009fe2fa2d3a3fd7e30b07f03cdf5874364
 #@untar:-J:sha256:ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd:.
 
 
diff --git a/variants/root-x86_64/pkgconf b/variants/root-x86_64/pkgconf
@@ -1,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+m4.af48d2213e4e0ee0f8ff27ab0d1a06593e86fbd0ad9e78c28f02df40e0769195
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+m4.d24f6161a9cf65301c5ac356fd6f3009fe2fa2d3a3fd7e30b07f03cdf5874364
 #@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.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+pkgconf.1baa77efb96c8a35c2a7f5d1005226acf7a9efab80034c0534cf0ec3aa782522
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+pkgconf.7687a6f174e2e4c156c14517e3e62e15888a5bfb5479c10f73e60303ac8d1f75
 
 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,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+m4.af48d2213e4e0ee0f8ff27ab0d1a06593e86fbd0ad9e78c28f02df40e0769195
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+m4.d24f6161a9cf65301c5ac356fd6f3009fe2fa2d3a3fd7e30b07f03cdf5874364
 #@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.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+zsh.782bc6b39d4d5bdb5d869ae7854258affe53f637ba226431c7f728ea0734fd6c
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+zsh.3cfc27ae8f891aaae6d39ecb2634464105283d343f64ef141d045986afff6a81
 #@sha256:1e021bddaf5c020ede9107656494715236a894557b99035365fc999605541b2d:pthbs-banginstall
 
 
diff --git a/variants/root-x86_64/rsync b/variants/root-x86_64/rsync
@@ -1,39 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+m4.af48d2213e4e0ee0f8ff27ab0d1a06593e86fbd0ad9e78c28f02df40e0769195
-#+nawk.b0b6f48e51cd2df5f27bbb8a4245bc1ba62894d23ef7709964f31cba2bbe4151
-#+popt.bdb659054e1d1103fdadcf7c0fb8a8e3d39aac69aa57b59dc73dde45b8bd83f9
-#+libressl.ebb087f0e9b957025a9d9ee630fcc9cdc87fbf381ba272aecef55a89a91dbae3
-#+zstd.0bf21a672f99cc391d6b28c9f6872f82b4d1409b2cff1fb3e149fa6b8266a3f8
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+m4.d24f6161a9cf65301c5ac356fd6f3009fe2fa2d3a3fd7e30b07f03cdf5874364
+#+nawk.d9e6772ebef80f34954ebc259423456d3262d5dd18eb8d0a4370a754ed3d507e
+#+popt.f98dbf3a124020e367b1339d0f34baad93ac21d3c8235f0fbdffa2a3d2d16d0d
+#+libressl.2b5f0a530f0b908ffa754aa61f8af9eb4b0a080b5e1f61dd5e9d4c419378e75f
+#+zstd.aeef72ab58744bf8c5b5661a85d359e1bf6182afed993b816f7083fa50b71f22
 #@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:.
 
 
diff --git a/variants/root-x86_64/s6 b/variants/root-x86_64/s6
@@ -1,36 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+skalibs.6929b509ca7d734b3cf1f220c54f1c48be8a50db1ce6fa9d4497244a98093a1f
-#+execline.8d78e097de88d6a9c16c60a637c8d3e895ef0fdd1dc80629388de6e69436bab7
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+skalibs.31a94e18a4f70eaca8b4606d3c6d1c9bc1719feb2e59d0509f07f57e5bf1cae6
+#+execline.0e1c445b7c9826013666afe1fd462c5ed887f4c77510aa963e5a6bed41d61dea
 #@git:0e02fe0e92b8f9a619fc355babad2c78c009c1f1:s6
 
 
@@ -47,7 +49,7 @@ cd 's6'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.6929b509ca7d734b3cf1f220c54f1c48be8a50db1ce6fa9d4497244a98093a1f/sysdeps' \
+	--with-sysdeps='/versions/skalibs.31a94e18a4f70eaca8b4606d3c6d1c9bc1719feb2e59d0509f07f57e5bf1cae6/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,35 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+skalibs.6929b509ca7d734b3cf1f220c54f1c48be8a50db1ce6fa9d4497244a98093a1f
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+skalibs.31a94e18a4f70eaca8b4606d3c6d1c9bc1719feb2e59d0509f07f57e5bf1cae6
 #@git:dc80225c0a78346300d100f0bf0182ed338c4b01:s6-dns
 
 
@@ -46,7 +48,7 @@ cd 's6-dns'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.6929b509ca7d734b3cf1f220c54f1c48be8a50db1ce6fa9d4497244a98093a1f/sysdeps' \
+	--with-sysdeps='/versions/skalibs.31a94e18a4f70eaca8b4606d3c6d1c9bc1719feb2e59d0509f07f57e5bf1cae6/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,37 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+skalibs.6929b509ca7d734b3cf1f220c54f1c48be8a50db1ce6fa9d4497244a98093a1f
-#+execline.8d78e097de88d6a9c16c60a637c8d3e895ef0fdd1dc80629388de6e69436bab7
-#+s6.ac4efadb8805a00cf42335a8265c4f23d1f607bd020040c51e2123db2e4a513e
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+skalibs.31a94e18a4f70eaca8b4606d3c6d1c9bc1719feb2e59d0509f07f57e5bf1cae6
+#+execline.0e1c445b7c9826013666afe1fd462c5ed887f4c77510aa963e5a6bed41d61dea
+#+s6.6930a30fdf52463ee0427111ce0a5d0363c8620f9d72aeb8da17d2c1e4bd655e
 #@git:b298e515efe16210048e504e3aec89ea1e627b73:s6-linux-init
 
 
@@ -48,7 +50,7 @@ cd 's6-linux-init'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.6929b509ca7d734b3cf1f220c54f1c48be8a50db1ce6fa9d4497244a98093a1f/sysdeps' \
+	--with-sysdeps='/versions/skalibs.31a94e18a4f70eaca8b4606d3c6d1c9bc1719feb2e59d0509f07f57e5bf1cae6/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,35 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+skalibs.6929b509ca7d734b3cf1f220c54f1c48be8a50db1ce6fa9d4497244a98093a1f
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+skalibs.31a94e18a4f70eaca8b4606d3c6d1c9bc1719feb2e59d0509f07f57e5bf1cae6
 #@git:a9e7acac41a8854546246dd39cb4daee54ead2cb:s6-linux-utils
 
 
@@ -46,7 +48,7 @@ cd 's6-linux-utils'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.6929b509ca7d734b3cf1f220c54f1c48be8a50db1ce6fa9d4497244a98093a1f/sysdeps' \
+	--with-sysdeps='/versions/skalibs.31a94e18a4f70eaca8b4606d3c6d1c9bc1719feb2e59d0509f07f57e5bf1cae6/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,39 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+skalibs.6929b509ca7d734b3cf1f220c54f1c48be8a50db1ce6fa9d4497244a98093a1f
-#+execline.8d78e097de88d6a9c16c60a637c8d3e895ef0fdd1dc80629388de6e69436bab7
-#+s6.ac4efadb8805a00cf42335a8265c4f23d1f607bd020040c51e2123db2e4a513e
-#+s6-dns.4bf935eb034621ab95e4394a807016d1195ec1a885f2375a8917c2cc7608c48d
-#+libressl.ebb087f0e9b957025a9d9ee630fcc9cdc87fbf381ba272aecef55a89a91dbae3
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+skalibs.31a94e18a4f70eaca8b4606d3c6d1c9bc1719feb2e59d0509f07f57e5bf1cae6
+#+execline.0e1c445b7c9826013666afe1fd462c5ed887f4c77510aa963e5a6bed41d61dea
+#+s6.6930a30fdf52463ee0427111ce0a5d0363c8620f9d72aeb8da17d2c1e4bd655e
+#+s6-dns.26a45ab20c89df6b038406d2c151d3f1e7a32fa038fbd942dce85e49a817fec4
+#+libressl.2b5f0a530f0b908ffa754aa61f8af9eb4b0a080b5e1f61dd5e9d4c419378e75f
 #@git:12b40106ed1727274cd6af379c4ba0ca7161700b:s6-networking
 
 
@@ -50,7 +52,7 @@ cd 's6-networking'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.6929b509ca7d734b3cf1f220c54f1c48be8a50db1ce6fa9d4497244a98093a1f/sysdeps' \
+	--with-sysdeps='/versions/skalibs.31a94e18a4f70eaca8b4606d3c6d1c9bc1719feb2e59d0509f07f57e5bf1cae6/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,35 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+skalibs.6929b509ca7d734b3cf1f220c54f1c48be8a50db1ce6fa9d4497244a98093a1f
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+skalibs.31a94e18a4f70eaca8b4606d3c6d1c9bc1719feb2e59d0509f07f57e5bf1cae6
 #@git:dc96d8a020e83b16dd7a8bd093bdb00ab2b944c0:s6-portable-utils
 
 
@@ -46,7 +48,7 @@ cd 's6-portable-utils'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.6929b509ca7d734b3cf1f220c54f1c48be8a50db1ce6fa9d4497244a98093a1f/sysdeps' \
+	--with-sysdeps='/versions/skalibs.31a94e18a4f70eaca8b4606d3c6d1c9bc1719feb2e59d0509f07f57e5bf1cae6/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,37 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+skalibs.6929b509ca7d734b3cf1f220c54f1c48be8a50db1ce6fa9d4497244a98093a1f
-#+execline.8d78e097de88d6a9c16c60a637c8d3e895ef0fdd1dc80629388de6e69436bab7
-#+s6.ac4efadb8805a00cf42335a8265c4f23d1f607bd020040c51e2123db2e4a513e
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+skalibs.31a94e18a4f70eaca8b4606d3c6d1c9bc1719feb2e59d0509f07f57e5bf1cae6
+#+execline.0e1c445b7c9826013666afe1fd462c5ed887f4c77510aa963e5a6bed41d61dea
+#+s6.6930a30fdf52463ee0427111ce0a5d0363c8620f9d72aeb8da17d2c1e4bd655e
 #@git:a4756f00b3823952580d1fee704675c6f813a248:s6-rc
 
 
@@ -48,7 +50,7 @@ cd 's6-rc'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.6929b509ca7d734b3cf1f220c54f1c48be8a50db1ce6fa9d4497244a98093a1f/sysdeps' \
+	--with-sysdeps='/versions/skalibs.31a94e18a4f70eaca8b4606d3c6d1c9bc1719feb2e59d0509f07f57e5bf1cae6/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,34 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
 #@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.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+zsh.782bc6b39d4d5bdb5d869ae7854258affe53f637ba226431c7f728ea0734fd6c
-#+pthbs-banginstall.53ae4b7e39b904f1d4bc5ffc74ad321b72640e17a03d9ca9542ac815d18db241
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+zsh.3cfc27ae8f891aaae6d39ecb2634464105283d343f64ef141d045986afff6a81
+#+pthbs-banginstall.fc0afb8645b68b930e3cd4ec043ae7d36108814c1e73a3ae56f29bb50fd8b3d7
 #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep
 
 
diff --git a/variants/root-x86_64/squashfs-tools b/variants/root-x86_64/squashfs-tools
@@ -1,37 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+attr.6af8a052abaec26cb2a08044eb5b35a8d994a0641b749b9d6517eaf57b944022
-#+zstd.0bf21a672f99cc391d6b28c9f6872f82b4d1409b2cff1fb3e149fa6b8266a3f8
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+attr.5f2b64ed46319813fd130218e456cb83f28355db9b589e36ee6202dba6477517
+#+zstd.aeef72ab58744bf8c5b5661a85d359e1bf6182afed993b816f7083fa50b71f22
 #@untar:-z:sha256:4672b5c47d9418d3a5ae5b243defc6d9eae8275b9771022247c6a6082c815914:.
 
 
diff --git a/variants/root-x86_64/strace b/variants/root-x86_64/strace
@@ -1,38 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+m4.af48d2213e4e0ee0f8ff27ab0d1a06593e86fbd0ad9e78c28f02df40e0769195
-#+patch.076d4ff4c78d93a698eb69b9bcf0c1ec0db1711016608ca949404f4ca6a3bc15
-#+libunwind.89d35172368019c9b789b3d2e67752a3170770f7dbd0adda7f1ff447aa57c1c2
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+m4.d24f6161a9cf65301c5ac356fd6f3009fe2fa2d3a3fd7e30b07f03cdf5874364
+#+patch.8ffbd0650e4352e1a62422cdc213249df8720035c5fd31632be07539997e7c27
+#+libunwind.cb7cb9a8b672d68ac89b6b9217e7d2285eea8cb52f6499792289e4aad88e42c9
 #@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.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-dosfstools.7011462e09412e95a131c7f17f781dc52a3d09ef98c3f16229cdda54367ff61d
-#+busybox-e2fsprogs.194431ad54edfd1ae6521451ad25944dd7b57c5a36be6fa844ebf897a482cb61
-#+busybox-iproute2.5b2a9e4b76c36ace2bbc85850fe25672d1e6ab43f6484728f072e5a2359146a6
-#+busybox-iputils.dbce8e6244a6d452b9467b468afdac800f5784e72c0faa4bd18e07f558983fd5
-#+busybox-net-misc.2ec61099e29c68e91df653e1c65f9268818b03b0b8d92fa84c85242bdf1e2543
-#+busybox-net-tools.8483788838f5f0e867fef10a411c47b81b4132ac16b9056e8ca85fd62d46f414
-#+busybox-traceroute.980ea04b05aa2270e601796bbd09ca517e9be4f248cd78b82f74f35d95f6acdc
-#+busybox-wget.b60a369f03f0abb8d3fcea52ab5e25465ddcb9d115afbae7d2782ea570acb8fc
-#+busybox-chpst.72d02280fa7f73b40fe1375bfd7a1827cc11e7c7a2551ada5b941b3dee3bf0fe
-#+busybox-console.3edef124d80e9f5d3b5017d05e4082e66fe0a126600305874d109a8bcd118c04
-#+busybox-getty.df935270a9a1c79c6575f4b0f11360f0d49371e475a881b7cb017aff63b42100
-#+busybox-i2c-tools.b24b0180bd00e9a26a2f45aad5b6fa488d21f3c501d07a16abcc00a0d07b0e9b
-#+busybox-linux-extra.2e9531ad95ad77c76713a26c4fd59d051a0eee0025fdedc7c109ab3d0c6ce4b6
-#+busybox-mtd-utils.5c0bce71a682337745bc7bb97d748a641ea5da0b57d8991fba75b0af3be6f39f
-#+busybox-shadow.5e8d9e6a3fadec78509604bbb6c648b77ccfa9e7bfa79f4e8ff3560d580e007b
-#+busybox-su.527f28a9c3e0f3563f7b0ba19c676b6c6ff41522b0dd7904329c086b7ff63d91
-#+busybox-util-linux-priv.98ad14c06bf3244ef05b08f4fa1bad408bd3cdd379e48465bd154eff1528967c
-#+busybox-logging.a04eef102414e27b9e72808dd3db5407b5be110b354371fe5f9714c3e3cc5a92
-#+busybox-cron.f4358813bdc4ede101b874bfcfe6329f2cb6ef71c82517c0c14f3dc8be05bd97
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+nawk.b0b6f48e51cd2df5f27bbb8a4245bc1ba62894d23ef7709964f31cba2bbe4151
-#+diffutils.202d28c6f743dfa95cfbd83a53839ce4202a7b5d8ee80a6d83d0091361f94261
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+aat.d0a7f3f97eac575b8f799abda76b4c099060a8d6d426b23fee5fbe65c8e2bc6a
-#+fileset.caa093c948c3d67f082802e7358e9804cc1ba55935954795989c3a89d20a68e1
-#+rsync.56f119107bf2c2014d84c4df7541d34d371558a809845b2c71d2c0be5af07f76
-#+execline.8d78e097de88d6a9c16c60a637c8d3e895ef0fdd1dc80629388de6e69436bab7
-#+kbd.7cf3bcf02221b144d0909c7ce89b50f5ed33f58946eb7f778baff090d025d04b
-#+mdevd.cc68834dea3e837ffeb64eb65b3a0e038e49cf43408b7b0354c981a0a9af74b1
-#+s6-linux-utils.c27db4183821bb896addb561679ab38a58df43af373b0bb00f964de2ca5c8afe
-#+s6-rc.307ca876ff37f53e2d434e5ac7e73fcd8b7d8ed81a3515d3600700cef30084b1
-#+s6.ac4efadb8805a00cf42335a8265c4f23d1f607bd020040c51e2123db2e4a513e
-#+zsh.782bc6b39d4d5bdb5d869ae7854258affe53f637ba226431c7f728ea0734fd6c
-#+libcgroup.ad4ea6a2cba3d042bf4af910f6674458c9dfa2939a59c4a155c64e932e554dab
-#+system-config-scripts.30798ea3326e014ebada167f1d252bca1d0d1b6b850b27b46e397387a5bbef25
-#+logincaps.1e414d2881c195ac19cfd0312563e783cbb25d9d8769f9353ba4ad4db5c3cb63
-#+busybox-modutils.8c57c4b2519128a862b9a6d9a7149e0f89babc90b6d8cbc10a978a944759e9c7
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-dosfstools.8758f98dd85943c48023b5fd5c5513a4851e002a2b3fe37799a5241ab1702f8b
+#+busybox-e2fsprogs.ba82e7ebcc9eaa83f50f89977152852525e749e581e71bb4a88e00e4928cb938
+#+busybox-iproute2.0ca0f46ff9151739aab5481c033c709fde6731618d2d337d92ecfb4618809386
+#+busybox-iputils.e011442498a620faeede6ed14adbf989746bd41ef5f2e0f87a3da0d7b0a877ec
+#+busybox-net-misc.c87f729a2573e4a84276b1dad0267a760133dce6bbe6b622ba171511f0984b31
+#+busybox-net-tools.c9b803918ba6541c9739702e16deaccca321189fc6fa32b58c13b45586371149
+#+busybox-traceroute.a28632aebe43fa2c7a81159b61fd84a3b140af07358304a74fda39d03be603db
+#+busybox-wget.2789f0f9e645fd20dfa57b7f6e2e183bb35dd3f548a0d8b908eaa6ca5cafad8f
+#+busybox-chpst.7a9d7a09935bab1a8b45a4428447a0abf8f8442eb7684600a83cd8cb0e216d7e
+#+busybox-console.facfbf29d559911533c847d9ebb25c24b888d1d854851ab5ec48fa21d61243c9
+#+busybox-getty.9838fc958f77e2e4e63c3c733bfa10a1b64a77baa0438324fc198a474cfacb33
+#+busybox-i2c-tools.4aa47a0a9f1e51aad96e0dcb52a5a559fa020e1bd5a9f8c49e844befe9176021
+#+busybox-linux-extra.8b365c5ee585314340ac35dfb3f7e700d2b966f12fc0bd4e80fca4326178a552
+#+busybox-mtd-utils.d49501b56438b14de5b8e505481bb4dc4fb7aca9781abb9ab9a88e484c881268
+#+busybox-shadow.2b4b66ce1941b10f6d951a338d45478558d1bb5114ff0860ef8bbf73f3fa5fb8
+#+busybox-su.063b7d82a85754dce5d87df9a74c5b267757fed08bba946cb0ada74d841c67dd
+#+busybox-util-linux-priv.9ad06562263ec79c267764340bec0a70037d06a8dbebde8c737062ee5b302c0a
+#+busybox-logging.9ccceb95e0b3543025d5b03d124143825b9aec849b043daa72dee6389492ef91
+#+busybox-cron.5945e934c750c1ad56ded4f666ea6f03229f8d405d6dd21505b93fe066cec863
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+nawk.d9e6772ebef80f34954ebc259423456d3262d5dd18eb8d0a4370a754ed3d507e
+#+diffutils.355c934ff9f3f9cb5aa1d9d82fb91123350dd118e8fe7a6d2827849834d9ad41
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+aat.6eaf761245becad24e0e6a4b35fe1dbcbb33d1168b9ebba2ae80d52676186463
+#+fileset.9a912b4ffa049a0e1e6a7991dc8f0a6076c660ce35c262065973fd811f0c60e2
+#+rsync.ea6c1c9a15de4bb825c701d87528994755fed38376fdf3f8292bc31fa8d055ee
+#+execline.0e1c445b7c9826013666afe1fd462c5ed887f4c77510aa963e5a6bed41d61dea
+#+kbd.2630434d0974e1c90b3c727dde9d2059d496c72fc7bcd7d6460e64c462b9c344
+#+mdevd.9963f50b8caaddc2c87f616dc7fbb6f84864b82206f4a3cc609df2b2b7d9ade8
+#+s6-linux-utils.0c364cde97fef6e0070c4fed062ae911e98e073d7be8342997019bb302a36476
+#+s6-rc.229c92ab8848bd9b0fb8416ea7e8aec3c5c3b461f049e13a531f14a142e27634
+#+s6.6930a30fdf52463ee0427111ce0a5d0363c8620f9d72aeb8da17d2c1e4bd655e
+#+zsh.3cfc27ae8f891aaae6d39ecb2634464105283d343f64ef141d045986afff6a81
+#+libcgroup.58e8157236f6d68bd1e89ac7432311a012ea0e02a3a956c376da192dcd02787a
+#+system-config-scripts.9db4a08a39b971e88f2eabeeda119e3a604240deeed4d380d26dfc97f3581fcf
+#+logincaps.aca7ff0283e34c3aec243c6da9006ec84e413bb67ad50573ca73f11ca3b44f7b
+#+busybox-modutils.729b8a85de1c715dd9962d9b101299d9e888bd6bf2fd6009e6439c6574e64215
 #@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.6b8291347db15af4810345a0614fc74c1841c06b042ff1817d9bc2e3d66e0954' \
-	'pthbs_path_mdevd=/versions/env.51d8a49525ba7b46f72a0bd409de65678f26acfb272e922170ab58a50a6b4583' \
+	'pthbs_path_containers=/versions/env.85a2576a865f5f03feb655799d64287840e48f258ce38d438291b1903da32b44' \
+	'pthbs_path_mdevd=/versions/env.66bcb11eff75250d21515474019614ad9b4bd48839d638713d2468c76496c822' \
 	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.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-dosfstools.7011462e09412e95a131c7f17f781dc52a3d09ef98c3f16229cdda54367ff61d
-#+busybox-e2fsprogs.194431ad54edfd1ae6521451ad25944dd7b57c5a36be6fa844ebf897a482cb61
-#+busybox-iproute2.5b2a9e4b76c36ace2bbc85850fe25672d1e6ab43f6484728f072e5a2359146a6
-#+busybox-iputils.dbce8e6244a6d452b9467b468afdac800f5784e72c0faa4bd18e07f558983fd5
-#+busybox-net-misc.2ec61099e29c68e91df653e1c65f9268818b03b0b8d92fa84c85242bdf1e2543
-#+busybox-net-tools.8483788838f5f0e867fef10a411c47b81b4132ac16b9056e8ca85fd62d46f414
-#+busybox-traceroute.980ea04b05aa2270e601796bbd09ca517e9be4f248cd78b82f74f35d95f6acdc
-#+busybox-wget.b60a369f03f0abb8d3fcea52ab5e25465ddcb9d115afbae7d2782ea570acb8fc
-#+busybox-chpst.72d02280fa7f73b40fe1375bfd7a1827cc11e7c7a2551ada5b941b3dee3bf0fe
-#+busybox-console.3edef124d80e9f5d3b5017d05e4082e66fe0a126600305874d109a8bcd118c04
-#+busybox-getty.df935270a9a1c79c6575f4b0f11360f0d49371e475a881b7cb017aff63b42100
-#+busybox-i2c-tools.b24b0180bd00e9a26a2f45aad5b6fa488d21f3c501d07a16abcc00a0d07b0e9b
-#+busybox-linux-extra.2e9531ad95ad77c76713a26c4fd59d051a0eee0025fdedc7c109ab3d0c6ce4b6
-#+busybox-mtd-utils.5c0bce71a682337745bc7bb97d748a641ea5da0b57d8991fba75b0af3be6f39f
-#+busybox-shadow.5e8d9e6a3fadec78509604bbb6c648b77ccfa9e7bfa79f4e8ff3560d580e007b
-#+busybox-su.527f28a9c3e0f3563f7b0ba19c676b6c6ff41522b0dd7904329c086b7ff63d91
-#+busybox-util-linux-priv.98ad14c06bf3244ef05b08f4fa1bad408bd3cdd379e48465bd154eff1528967c
-#+busybox-logging.a04eef102414e27b9e72808dd3db5407b5be110b354371fe5f9714c3e3cc5a92
-#+busybox-cron.f4358813bdc4ede101b874bfcfe6329f2cb6ef71c82517c0c14f3dc8be05bd97
-#+s6.ac4efadb8805a00cf42335a8265c4f23d1f607bd020040c51e2123db2e4a513e
-#+s6-rc.307ca876ff37f53e2d434e5ac7e73fcd8b7d8ed81a3515d3600700cef30084b1
-#+s6-portable-utils.40caf4adf71f62a7a5bd027d822e4030f696e62187f81f274a10d1f806637988
-#+s6-linux-init.f104ecaaf5cb616d85b9ebe959b4566fd50542dd57d380fb5893898f72b66a4a
-#+execline.8d78e097de88d6a9c16c60a637c8d3e895ef0fdd1dc80629388de6e69436bab7
-#+system-config-rc.0330b5dc0b177f059c8efac9b744e5092efff7a6c9c169d2bc431083786a0ed5
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-dosfstools.8758f98dd85943c48023b5fd5c5513a4851e002a2b3fe37799a5241ab1702f8b
+#+busybox-e2fsprogs.ba82e7ebcc9eaa83f50f89977152852525e749e581e71bb4a88e00e4928cb938
+#+busybox-iproute2.0ca0f46ff9151739aab5481c033c709fde6731618d2d337d92ecfb4618809386
+#+busybox-iputils.e011442498a620faeede6ed14adbf989746bd41ef5f2e0f87a3da0d7b0a877ec
+#+busybox-net-misc.c87f729a2573e4a84276b1dad0267a760133dce6bbe6b622ba171511f0984b31
+#+busybox-net-tools.c9b803918ba6541c9739702e16deaccca321189fc6fa32b58c13b45586371149
+#+busybox-traceroute.a28632aebe43fa2c7a81159b61fd84a3b140af07358304a74fda39d03be603db
+#+busybox-wget.2789f0f9e645fd20dfa57b7f6e2e183bb35dd3f548a0d8b908eaa6ca5cafad8f
+#+busybox-chpst.7a9d7a09935bab1a8b45a4428447a0abf8f8442eb7684600a83cd8cb0e216d7e
+#+busybox-console.facfbf29d559911533c847d9ebb25c24b888d1d854851ab5ec48fa21d61243c9
+#+busybox-getty.9838fc958f77e2e4e63c3c733bfa10a1b64a77baa0438324fc198a474cfacb33
+#+busybox-i2c-tools.4aa47a0a9f1e51aad96e0dcb52a5a559fa020e1bd5a9f8c49e844befe9176021
+#+busybox-linux-extra.8b365c5ee585314340ac35dfb3f7e700d2b966f12fc0bd4e80fca4326178a552
+#+busybox-mtd-utils.d49501b56438b14de5b8e505481bb4dc4fb7aca9781abb9ab9a88e484c881268
+#+busybox-shadow.2b4b66ce1941b10f6d951a338d45478558d1bb5114ff0860ef8bbf73f3fa5fb8
+#+busybox-su.063b7d82a85754dce5d87df9a74c5b267757fed08bba946cb0ada74d841c67dd
+#+busybox-util-linux-priv.9ad06562263ec79c267764340bec0a70037d06a8dbebde8c737062ee5b302c0a
+#+busybox-logging.9ccceb95e0b3543025d5b03d124143825b9aec849b043daa72dee6389492ef91
+#+busybox-cron.5945e934c750c1ad56ded4f666ea6f03229f8d405d6dd21505b93fe066cec863
+#+s6.6930a30fdf52463ee0427111ce0a5d0363c8620f9d72aeb8da17d2c1e4bd655e
+#+s6-rc.229c92ab8848bd9b0fb8416ea7e8aec3c5c3b461f049e13a531f14a142e27634
+#+s6-portable-utils.52deaad03a548f5f3c8edd25205e43ae11bedef77fbac891f1e980e2cca04a88
+#+s6-linux-init.3d521a56335823c378f9028d22c1916c47fb091e72c67725dbee519daf67aa2a
+#+execline.0e1c445b7c9826013666afe1fd462c5ed887f4c77510aa963e5a6bed41d61dea
+#+system-config-rc.9c950f34bdb5b8690c462042b85aca5d8a2a4279337eca79cc7632a0ddd2cfc7
 
 
 # - build script start -
@@ -76,7 +76,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-s6rcdb=/versions/system-config-rc.0330b5dc0b177f059c8efac9b744e5092efff7a6c9c169d2bc431083786a0ed5/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.9c950f34bdb5b8690c462042b85aca5d8a2a4279337eca79cc7632a0ddd2cfc7/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.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+s6-rc.307ca876ff37f53e2d434e5ac7e73fcd8b7d8ed81a3515d3600700cef30084b1
-#+fileset.caa093c948c3d67f082802e7358e9804cc1ba55935954795989c3a89d20a68e1
-#+system-config.665e72e1082a86bc620edb5cab200b1b71e4e2d6eadfdfea5abbb917000529b1
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+s6-rc.229c92ab8848bd9b0fb8416ea7e8aec3c5c3b461f049e13a531f14a142e27634
+#+fileset.9a912b4ffa049a0e1e6a7991dc8f0a6076c660ce35c262065973fd811f0c60e2
+#+system-config.f656676a2ceade02bf966e4cead2a5cd1c1c237bcac21693485558c31f84695e
 
 
 # - build script start -
@@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-src=/versions/system-config.665e72e1082a86bc620edb5cab200b1b71e4e2d6eadfdfea5abbb917000529b1/config/s6-rc-source
+src=/versions/system-config.f656676a2ceade02bf966e4cead2a5cd1c1c237bcac21693485558c31f84695e/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.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+zsh.782bc6b39d4d5bdb5d869ae7854258affe53f637ba226431c7f728ea0734fd6c
-#+pthbs-banginstall.53ae4b7e39b904f1d4bc5ffc74ad321b72640e17a03d9ca9542ac815d18db241
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+zsh.3cfc27ae8f891aaae6d39ecb2634464105283d343f64ef141d045986afff6a81
+#+pthbs-banginstall.fc0afb8645b68b930e3cd4ec043ae7d36108814c1e73a3ae56f29bb50fd8b3d7
 #@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.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+zsh.782bc6b39d4d5bdb5d869ae7854258affe53f637ba226431c7f728ea0734fd6c
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+zsh.3cfc27ae8f891aaae6d39ecb2634464105283d343f64ef141d045986afff6a81
 #@git:6dfbe33079e2f8c64c5daed29aa1ea3e7e3f2d59:system-config-zsh
 
 
diff --git a/variants/root-x86_64/tinyssh b/variants/root-x86_64/tinyssh
@@ -1,35 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
 #@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.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+execline.8d78e097de88d6a9c16c60a637c8d3e895ef0fdd1dc80629388de6e69436bab7
-#+pthbs-banginstall.53ae4b7e39b904f1d4bc5ffc74ad321b72640e17a03d9ca9542ac815d18db241
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+execline.0e1c445b7c9826013666afe1fd462c5ed887f4c77510aa963e5a6bed41d61dea
+#+pthbs-banginstall.fc0afb8645b68b930e3cd4ec043ae7d36108814c1e73a3ae56f29bb50fd8b3d7
 #@sha256:664430d033e0b491a5ed90cb39cb17cddb57ac0be9f3f2bf014264f3c17d55df:user-env
 
 
diff --git a/variants/root-x86_64/userspace.environment b/variants/root-x86_64/userspace.environment
@@ -1,90 +1,92 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-dosfstools.7011462e09412e95a131c7f17f781dc52a3d09ef98c3f16229cdda54367ff61d
-#+busybox-e2fsprogs.194431ad54edfd1ae6521451ad25944dd7b57c5a36be6fa844ebf897a482cb61
-#+busybox-iproute2.5b2a9e4b76c36ace2bbc85850fe25672d1e6ab43f6484728f072e5a2359146a6
-#+busybox-iputils.dbce8e6244a6d452b9467b468afdac800f5784e72c0faa4bd18e07f558983fd5
-#+busybox-net-misc.2ec61099e29c68e91df653e1c65f9268818b03b0b8d92fa84c85242bdf1e2543
-#+busybox-net-tools.8483788838f5f0e867fef10a411c47b81b4132ac16b9056e8ca85fd62d46f414
-#+busybox-traceroute.980ea04b05aa2270e601796bbd09ca517e9be4f248cd78b82f74f35d95f6acdc
-#+busybox-wget.b60a369f03f0abb8d3fcea52ab5e25465ddcb9d115afbae7d2782ea570acb8fc
-#+busybox-chpst.72d02280fa7f73b40fe1375bfd7a1827cc11e7c7a2551ada5b941b3dee3bf0fe
-#+busybox-console.3edef124d80e9f5d3b5017d05e4082e66fe0a126600305874d109a8bcd118c04
-#+busybox-getty.df935270a9a1c79c6575f4b0f11360f0d49371e475a881b7cb017aff63b42100
-#+busybox-i2c-tools.b24b0180bd00e9a26a2f45aad5b6fa488d21f3c501d07a16abcc00a0d07b0e9b
-#+busybox-linux-extra.2e9531ad95ad77c76713a26c4fd59d051a0eee0025fdedc7c109ab3d0c6ce4b6
-#+busybox-mtd-utils.5c0bce71a682337745bc7bb97d748a641ea5da0b57d8991fba75b0af3be6f39f
-#+busybox-shadow.5e8d9e6a3fadec78509604bbb6c648b77ccfa9e7bfa79f4e8ff3560d580e007b
-#+busybox-su.527f28a9c3e0f3563f7b0ba19c676b6c6ff41522b0dd7904329c086b7ff63d91
-#+busybox-util-linux-priv.98ad14c06bf3244ef05b08f4fa1bad408bd3cdd379e48465bd154eff1528967c
-#+busybox-logging.a04eef102414e27b9e72808dd3db5407b5be110b354371fe5f9714c3e3cc5a92
-#+busybox-cron.f4358813bdc4ede101b874bfcfe6329f2cb6ef71c82517c0c14f3dc8be05bd97
-#+attr.6af8a052abaec26cb2a08044eb5b35a8d994a0641b749b9d6517eaf57b944022
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+diffutils.202d28c6f743dfa95cfbd83a53839ce4202a7b5d8ee80a6d83d0091361f94261
-#+patch.076d4ff4c78d93a698eb69b9bcf0c1ec0db1711016608ca949404f4ca6a3bc15
-#+flex.6908c61fe7c161a8e994e1438c02c7e1a45eaf556b85e5da5b9b19af0d824a26
-#+bison.18d45c14bbdaffcf1fe22f7faec2de087ec4ef6ad2360124c7309124cf3c7246
-#+rsync.56f119107bf2c2014d84c4df7541d34d371558a809845b2c71d2c0be5af07f76
-#+execline.8d78e097de88d6a9c16c60a637c8d3e895ef0fdd1dc80629388de6e69436bab7
-#+s6.ac4efadb8805a00cf42335a8265c4f23d1f607bd020040c51e2123db2e4a513e
-#+s6-rc.307ca876ff37f53e2d434e5ac7e73fcd8b7d8ed81a3515d3600700cef30084b1
-#+s6-portable-utils.40caf4adf71f62a7a5bd027d822e4030f696e62187f81f274a10d1f806637988
-#+s6-linux-utils.c27db4183821bb896addb561679ab38a58df43af373b0bb00f964de2ca5c8afe
-#+s6-linux-init.f104ecaaf5cb616d85b9ebe959b4566fd50542dd57d380fb5893898f72b66a4a
-#+mdevd.cc68834dea3e837ffeb64eb65b3a0e038e49cf43408b7b0354c981a0a9af74b1
-#+s6-dns.4bf935eb034621ab95e4394a807016d1195ec1a885f2375a8917c2cc7608c48d
-#+libressl.ebb087f0e9b957025a9d9ee630fcc9cdc87fbf381ba272aecef55a89a91dbae3
-#+s6-networking.2deaf8ddb2eb1625c4ebf3e693c58434dbb04f7855e824a35bd07ccd130cac3a
-#+zsh.782bc6b39d4d5bdb5d869ae7854258affe53f637ba226431c7f728ea0734fd6c
-#+pthbs-banginstall.53ae4b7e39b904f1d4bc5ffc74ad321b72640e17a03d9ca9542ac815d18db241
-#+aat.d0a7f3f97eac575b8f799abda76b4c099060a8d6d426b23fee5fbe65c8e2bc6a
-#+confz.76beee334a5b34b75462769141e3473fdaf1af65174d28a870350da7356dcc95
-#+containers.2477d39b35528be55fd68ecc9b4dddd27440fd2f93abfd64b7d61addf0a42c2c
-#+fileset.caa093c948c3d67f082802e7358e9804cc1ba55935954795989c3a89d20a68e1
-#+logincaps.1e414d2881c195ac19cfd0312563e783cbb25d9d8769f9353ba4ad4db5c3cb63
-#+snaprep.bd9cf14607b1b770d8cfaa0a7e7b90c4b91367e766b6e61388b19d988c701f4c
-#+curl.27e0d7991efbe8c7cf5665287a93bb83e16a6641fc7407bc3708f877e993dace
-#+git.f76144385243b6d3df20325c67746004e5f353ef455ab117e6fa4d458d922645
-#+xbps.c0a01fae4e3afaf53e662fce7c078459e20ce7508714ee1660889ebf8d914a7e
-#+apk-tools.f7f5741f228aaaea1f939d588d6d6ee0992a053a24d3566acf75ef96ba3f2ab1
-#+getent.2b9aefd6dc2cac1bcfe11ae508a59ea0a2f2cc0dc2277d73c24cb855ba21631e
-#+getconf.09aa492622e13546bffa91c13c46d8b9ba450544d5f79d939804b943a0ed78db
-#+iconv.04acaa8af0dddddc6a7ae951e7a238955acc88b1a81229aa05424df28703261a
-#+libcap.137a0116b41ce8675968d0e8a5609294a4ba062dc1812abc56eb56dd129b23f7
-#+applyuidgid-caps.28e02ab4f45362b4c80fe8d9b96926554966e2516a0cffbe8819cf83554f1b66
-#+ccx-utils.467a4a4c8eb649a44e80d08515a4716d2c2a63a3e518b148fa9be6ff6d378551
-#+user-env.01ec585ea8bb3bc0a120785a14f51e301d39b866f7fb75e55c45a39de03ed79f
-#+strace.3a32d6ff413c9f13494da5688884d3aa3396888bddf2dab9a061404ff8aa4dc3
-#+mlog.cfe65ee50f6180e9d6ff7423d065920847a48ded07751ad2c4d63135652e5cbb
-#+findutils.3b76b6f5ace1499bfeeaa28bd8e1e999b3c47b26de613ea10314ab02109fef9d
-#+nawk.b0b6f48e51cd2df5f27bbb8a4245bc1ba62894d23ef7709964f31cba2bbe4151
-#+squashfs-tools.69ff5750b42d3e1a620a1c8527c3b3e60f975fc25c84abaf5729e90ce57ba050
-#+mandoc.95646e8bb465de0483f33132cc57cbe45b71791a41aa5e34104597a43f01b7cd
-#+tinyssh.7ea9a30d1e5545419776669594d256b71beb324ea5d949465575ee70a3e3359e-
\ No newline at end of file
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-dosfstools.8758f98dd85943c48023b5fd5c5513a4851e002a2b3fe37799a5241ab1702f8b
+#+busybox-e2fsprogs.ba82e7ebcc9eaa83f50f89977152852525e749e581e71bb4a88e00e4928cb938
+#+busybox-iproute2.0ca0f46ff9151739aab5481c033c709fde6731618d2d337d92ecfb4618809386
+#+busybox-iputils.e011442498a620faeede6ed14adbf989746bd41ef5f2e0f87a3da0d7b0a877ec
+#+busybox-net-misc.c87f729a2573e4a84276b1dad0267a760133dce6bbe6b622ba171511f0984b31
+#+busybox-net-tools.c9b803918ba6541c9739702e16deaccca321189fc6fa32b58c13b45586371149
+#+busybox-traceroute.a28632aebe43fa2c7a81159b61fd84a3b140af07358304a74fda39d03be603db
+#+busybox-wget.2789f0f9e645fd20dfa57b7f6e2e183bb35dd3f548a0d8b908eaa6ca5cafad8f
+#+busybox-chpst.7a9d7a09935bab1a8b45a4428447a0abf8f8442eb7684600a83cd8cb0e216d7e
+#+busybox-console.facfbf29d559911533c847d9ebb25c24b888d1d854851ab5ec48fa21d61243c9
+#+busybox-getty.9838fc958f77e2e4e63c3c733bfa10a1b64a77baa0438324fc198a474cfacb33
+#+busybox-i2c-tools.4aa47a0a9f1e51aad96e0dcb52a5a559fa020e1bd5a9f8c49e844befe9176021
+#+busybox-linux-extra.8b365c5ee585314340ac35dfb3f7e700d2b966f12fc0bd4e80fca4326178a552
+#+busybox-mtd-utils.d49501b56438b14de5b8e505481bb4dc4fb7aca9781abb9ab9a88e484c881268
+#+busybox-shadow.2b4b66ce1941b10f6d951a338d45478558d1bb5114ff0860ef8bbf73f3fa5fb8
+#+busybox-su.063b7d82a85754dce5d87df9a74c5b267757fed08bba946cb0ada74d841c67dd
+#+busybox-util-linux-priv.9ad06562263ec79c267764340bec0a70037d06a8dbebde8c737062ee5b302c0a
+#+busybox-logging.9ccceb95e0b3543025d5b03d124143825b9aec849b043daa72dee6389492ef91
+#+busybox-cron.5945e934c750c1ad56ded4f666ea6f03229f8d405d6dd21505b93fe066cec863
+#+attr.5f2b64ed46319813fd130218e456cb83f28355db9b589e36ee6202dba6477517
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+diffutils.355c934ff9f3f9cb5aa1d9d82fb91123350dd118e8fe7a6d2827849834d9ad41
+#+patch.8ffbd0650e4352e1a62422cdc213249df8720035c5fd31632be07539997e7c27
+#+flex.551b952e53ccbf2f3813092dd34a257f124285fa613ca496bb8cd2e56453d400
+#+bison.cde4aca804e398acfd0f7b421f8822f0ea5f332b286b5722866e401a731b2016
+#+rsync.ea6c1c9a15de4bb825c701d87528994755fed38376fdf3f8292bc31fa8d055ee
+#+execline.0e1c445b7c9826013666afe1fd462c5ed887f4c77510aa963e5a6bed41d61dea
+#+s6.6930a30fdf52463ee0427111ce0a5d0363c8620f9d72aeb8da17d2c1e4bd655e
+#+s6-rc.229c92ab8848bd9b0fb8416ea7e8aec3c5c3b461f049e13a531f14a142e27634
+#+s6-portable-utils.52deaad03a548f5f3c8edd25205e43ae11bedef77fbac891f1e980e2cca04a88
+#+s6-linux-utils.0c364cde97fef6e0070c4fed062ae911e98e073d7be8342997019bb302a36476
+#+s6-linux-init.3d521a56335823c378f9028d22c1916c47fb091e72c67725dbee519daf67aa2a
+#+mdevd.9963f50b8caaddc2c87f616dc7fbb6f84864b82206f4a3cc609df2b2b7d9ade8
+#+s6-dns.26a45ab20c89df6b038406d2c151d3f1e7a32fa038fbd942dce85e49a817fec4
+#+libressl.2b5f0a530f0b908ffa754aa61f8af9eb4b0a080b5e1f61dd5e9d4c419378e75f
+#+s6-networking.6fce4b03e3a1a3d7f6b5d8ccd53b15b4b7a58dbc36905cd9300b9f1463f9afa1
+#+zsh.3cfc27ae8f891aaae6d39ecb2634464105283d343f64ef141d045986afff6a81
+#+pthbs-banginstall.fc0afb8645b68b930e3cd4ec043ae7d36108814c1e73a3ae56f29bb50fd8b3d7
+#+aat.6eaf761245becad24e0e6a4b35fe1dbcbb33d1168b9ebba2ae80d52676186463
+#+confz.aee9397510903f0624469d0752e1ebd084510b6055e858521b31155dd12b6984
+#+containers.4cb1840c8d2f213dfcea6e9b7772838dd4b5936e813176b35c4f53b257a1b258
+#+fileset.9a912b4ffa049a0e1e6a7991dc8f0a6076c660ce35c262065973fd811f0c60e2
+#+logincaps.aca7ff0283e34c3aec243c6da9006ec84e413bb67ad50573ca73f11ca3b44f7b
+#+snaprep.51398a30add776578e1b226b224a0b02db03fdeea816120039f10d3eff251b7d
+#+curl.0278b42ba8736000f2c5c7b0874d3d1ac3a7a6bc5d187bc1fe4ba1a3a51fc2f4
+#+git.9d20069a12463ae590c62d06cf09b2b9c00614184e2ba5739cd383ab0f5f05c5
+#+xbps.de057c379b2c3459b5fdf56bc1a771cbf2cb4d8239fe0e4d4bb1c2c6f5e953a1
+#+apk-tools.bb4a0c78d2c2c4f4f7eb3101f1f5e360dad7cdd1a9b35288164eed807b339f1b
+#+getent.e71234ea42d32d1bf266247903a928736abf60856803ceb63470c4d3e0121f37
+#+getconf.f98fe95e85910bb452a3b0ac6dece4b1d19f75ea14b4657f008c0cd1805a919d
+#+iconv.41a3368c28f82f39fa16f3dd57fef9ed4313d7add5b89ed9941691d7d3d2f94c
+#+libcap.e249982965b9c03c69588f47cb3b0147ae3b8b4449bc4ca58eae16d549740381
+#+applyuidgid-caps.0b2c9ae2da57f24fac9256e16cb51a6c3c325ed1ca1235bbf94201ff8fc27184
+#+ccx-utils.751c4fd33391452950426c1438e5bc2865aa0cf5febf85ce980369f05d64ff08
+#+user-env.61023cc4489b3d1e3424aeb0cbbbe80d20d5d2789d70db86d6ea60d8eff27d38
+#+strace.b9b217a88126145f83d76895f2abab63a3a8093a7314345c7f70963112a61b4b
+#+mlog.2fcb48e3b1c82b636ae650b7b43c71359e8cb5a93d4a8dc40bd1c7b4a67fe42d
+#+findutils.e7a23ee4e23d84aeecb3712512ca7e100fde792af5cc52e511a56d262f55f463
+#+nawk.d9e6772ebef80f34954ebc259423456d3262d5dd18eb8d0a4370a754ed3d507e
+#+squashfs-tools.4077c781fafda17ae0e788051cb62b03a1cec2743efba08a50663246efe287bc
+#+mandoc.0c979816277590217ddc0e955fd7822a1598218684089287d4f9a271cbd26d70
+#+tinyssh.fef12a201cc09ba23ae5ca30f53837a193f56aec8e35045964344e6471c654df+
\ 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.207492973bab8e93bb515be09755c5296fe2d93382f59ea8236817ccc5353877-
\ No newline at end of file
+#+linux-qemu-guest.a4d9ac4e5b135682d0f2a2fb0eeb9d09aaa2f9516b996c9b48ae98b42fc57700+
\ No newline at end of file
diff --git a/variants/root-x86_64/xbps b/variants/root-x86_64/xbps
@@ -1,37 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+libarchive.e6f37a18b4f93321262bbcf721174b713dd0db1ce16814d463523f5208b39bf2
-#+libressl.ebb087f0e9b957025a9d9ee630fcc9cdc87fbf381ba272aecef55a89a91dbae3
-#+pkgconf-pkg-config.16a3e6160fefe153ceebfea9add030039591396575b042b519213e1c41346ab6
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+libarchive.36f441fbd816c0f186766de02ebaa5548c8c1227a22b09446e3781fec125b3a0
+#+libressl.2b5f0a530f0b908ffa754aa61f8af9eb4b0a080b5e1f61dd5e9d4c419378e75f
+#+pkgconf-pkg-config.921512d4a6b33d0c4726be0d87f5fa43cae8c53c8ecddd8d929640f446052f29
 #@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:.
 
 
diff --git a/variants/root-x86_64/zsh b/variants/root-x86_64/zsh
@@ -1,38 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+m4.af48d2213e4e0ee0f8ff27ab0d1a06593e86fbd0ad9e78c28f02df40e0769195
-#+netbsd-curses.4a62b90d0698e92686ff508103ea2c8a5396dca5ab8896c357da6363896fb18d
-#+libbsd.0ab1cb102c31e18600d93e1c4bc4332aac65015449017303d1342326bd1af076
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+m4.d24f6161a9cf65301c5ac356fd6f3009fe2fa2d3a3fd7e30b07f03cdf5874364
+#+netbsd-curses.b548b8886b334b2d3641b491a5d8f2fc4a3eb3cf8fb8b321d7c01b1594790d10
+#+libbsd.31f506e5ede9ff28ab53f70a14b649b95dffe89e7a4eb2b707f77658590dcb8c
 #@git:c73505cc47870bd09e8e204d98ac5976e0d4cb52:zsh_config
 #@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:.
 
diff --git a/variants/root-x86_64/zstd b/variants/root-x86_64/zstd
@@ -1,35 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.297e5b1487375a244d6628d48d6321e8520e25399ce39cb0da0c8f0077e535fd
-#+busybox-bzip2.b37692159d3e67287407f1498d31b899773e9304eda79f9264ebb46dfb0d3344
-#+busybox-gzip.0647d52fc974b08323f0da148edeb77d7a495f33294b0998f1b810f33ef64d7f
-#+busybox-lzop.56b0ba2e3a183c341a5fdd274e26199cb3a6b6d1e2a648d706363c98a9913115
-#+busybox-unzip.7e37273b4ffef8a0fcf81c89d78290072499497fc281e8b5dd1dc6100d5c3774
-#+busybox-xz.e02a2102c73018346290e562007e77e9348f348adc5ab01f74982252d2e07788
-#+busybox-cpio.f22b6d0538e1352ac708551fac185cd0fd7fbfea55118117f17b522422b76bb4
-#+busybox-dpkg.3602587cd1cf0f080bc6310247f9390ed1e9d26287e74e0b8e438b0825c9c7ff
-#+busybox-rpm.2b609f190b19f2a7cdfbb81b53d4945c43486a4e0bfd770f5217ccb4596049e6
-#+busybox-tar.6f212387fb54425f165b878292c7f91920d3711f65d18ad42fdc5189899106a9
-#+busybox-ed.1ea1ae3e014b1427f3c3bbb2449d32346fb606f7b3443bd561951b4281f09636
-#+busybox-sed.85a7d4d7968ff71e3168f04db0b6bf1f44eadc9dcd381fe688501d67bc1d35c8
-#+busybox-vi.7bc287b397b8ae7ea67846b809e4a3d4983f4af5a7b5e8f500e833bd95cfe2a9
-#+busybox-xxd.38cca8f5aca9cb5743ed786a69755816eaea90b1a3113640a14177b127069283
-#+busybox-process-extra.dbe3d5afb1b189f242dd6b8122d279f052dd1e052a29038f97e4ac6dedadc6d4
-#+busybox-procps.235b2938754b7851a23175063c324382adfd8b7e6fe866b8019bec90a22a241e
-#+busybox-psmisc.addd21c60ed05fceb8a9701fdc5165244cf627987fb5e7e27eb0eb1ae62a88f2
-#+busybox-ash.32ef3c68ff72699b72983271bbdef714859e8109e9876969376cca6da9dcb564
-#+busybox-bc.a388711c1b580c52cc7562dc0a6d7b01ce6e11ef7e680c99afe5dfc0b3cce4ae
-#+busybox-coreutils.858d44a6ca5aa0b3a793d6b7a46aa613255f3a91ed6ed76b3c7765147ee5d142
-#+busybox-coreutils-extra.c5539fcee5b0862009f5a98d8047bdbfb2c2bf5f5516d5f43a33cc4e3614ca0f
-#+busybox-daemontools.98bef64e021f272381b92f403920f76db6f9f1d4dbed781043a6c19551c0640f
-#+busybox-grep.f44a921e38a46a94a65aa746c2dd048205189145690fc9012413911942079d0b
-#+busybox-misc.4b8e7639c2d4d2b445878e1785fcba9f9e56bf840a47b15a67d41b9801b73349
-#+busybox-sh.124db818d84764dfa09dae7795627cfd189915520934e175ec46b5a8315cc874
-#+busybox-util-linux-unpriv.143490aa4835889d78fc48b6be81d0fc02c9255ef99e5b69d992cff9131c93b5
-#+busybox-findutils.a4e7e7ab0b05767dbb6a48e2c1570093ee9803e71e2d2f87a61cd998b7154ad1
-#+busybox-awk.efae9b5157ae95f461f06045e89ad5e603ef4499d5e0d5d9c735af62cda79516
-#+musl-cross-make.2b9f35b57a2138d7b50a6ac25e1c9516fb7515654209519dc67bf390fa61dccd
-#+gnu-make.dc1cacf718f4db1c2047f36324c91270e97e92f8e2e2a6d6fb88bc38bb9e517d
-#+busybox-diffutils.a6460e5e17b3fc320543a36fa28d9ec52be06043559de8fd6588eef697378927
+#+busybox.b2c83a0d98a31de0990153296712b7b0b5b7cb690ff7532821861314922740dd
+#+busybox-bzip2.22a3cbd9621cb9553f6c160e1737ff9a5a86382c2dc372086c017ee5e16714a9
+#+busybox-gzip.47f0cee319e909a48bed0deb0e23ae09e08b9ff10ad6563a244bc768a14f03c6
+#+busybox-lzop.ba51fd972e62a037e5f648eaad515cdc9e48b93a481b0afb2919f66e61df07bd
+#+busybox-unzip.4496326ed9a557ae55ac44eb1c30abd82678c0df6b2666f61a307e693a0a9769
+#+busybox-xz.d07afcc465f08768be886d464c376ee661809106b6bbc7afaf09ab19321bbc0b
+#+busybox-cpio.4025c65fb29c5e6b168a1ab1f8155391606eac6443c579da2c73a98472c8f193
+#+busybox-dpkg.359cc49a65e66b0172ebc5af581795aec562520a588f82b812c3d67763d1daa4
+#+busybox-rpm.748d3b048499ffee17acad32bdce915b877a06feca7a5c7ab48ce9cf071df5f7
+#+busybox-tar.b163f76023e73d868b90f62ff7a16e0cef701c673210147627be2fd94bbdfc7e
+#+busybox-ed.150ea06646b0a3512b5625f42f20154265befcb4cb31b6e63b7c0f73d9d9fc50
+#+busybox-sed.4400e701971b90027df31dbc7b03be795e23651f3be94bcab2d18481e93541c6
+#+busybox-vi.1fddcd66d834058dd0485294f2fb4dcbe599df2eb537dc2c7e6d16154b28ecba
+#+busybox-xxd.e37eb9c77d0b6def75de6cb868661925fb34fbb8d6a0d5e481b22ca337b519fe
+#+busybox-process-extra.f3a7617ee65b6d986a501d24731fe5fbfad2ea426447e184eba2aa7cbd5485d4
+#+busybox-procps.35ce5ce611f437b75bd4772872d010378f201e518c60ab44b6c8da871814b48b
+#+busybox-psmisc.52c57c203a381e9e1b217cc5c42129b84d88a84685239b79530f6535fda3d395
+#+busybox-ash.edea7717e9be7fa91f8249ff4c1bbdfc8a04a7f710b67e0edfd3036202f58545
+#+busybox-bc.da593f1033ea4b2919b07df631e7455ff8d2952d357f2227d951b02a6a0a29b8
+#+busybox-coreutils.5e328ff50e96a4b57561be61dbbec434eeebdab51c26ac1c8da7c1ea4a91c4a7
+#+busybox-coreutils-extra.b02a27ac3046ffbe0900bfa684419032260459bf05d03991e7b399ed57bd5222
+#+busybox-daemontools.0a77360d3642fbb3b8e7ec913e0ad9f5a8fbb77f0ddf21be3febf9a53ec90d1f
+#+busybox-grep.26cb5d88f6872394d39d52fb396b984d7cb750f2b117664d2b09e40697ab9205
+#+busybox-misc.1c32308b3384ee4ecc1b1701e643546d4afd2c51719ac6f4227ffd890a1157da
+#+busybox-sh.1d471894c3c6934d74c086bf08f2ad62c93c24cc3c6292b3226740df5cfbac62
+#+busybox-util-linux-unpriv.4e4b7ef9e60a4e3b3e11ce613efbb6594f2d8228f2068c91ad9bf782ca3c796e
+#+busybox-findutils.296272da9b37451b7e23cd2673e50989263603f39a99cc5babd2d97cb9226584
+#+busybox-awk.a1619fb728703381961acaae188648c05bf7269fe2f02dcb8e8165731bcdfc09
+#+musl.d1d70538038e798c22d8f04fb3d23263bdcffac3c427fa1a9301697fb78ff58d
+#+gcc.c4e91843899a91a131f77080c8d419252e4e2d1e674c5cab1da9894720260832
+#+binutils.3f83c76926d0a51e1900835db99749a7b68b35df67c39e272e3e710bf89ebb5d
+#+gnu-make.a5d41ef1c09272a1d157ca00822fdf6589904af9a686ccddc8dadfe2047582df
+#+busybox-diffutils.18dddf7fbdfb6606d16143cfbfc8160cd81bc2a4db8316aaa62326771e133d08
 #@untar:-z:sha256:98e9c3d949d1b924e28e01eccb7deed865eefebf25c2f21c702e5cd5b63b85e1:.