mrrl

Minimal Reliable Reproducible Linux
git clone https://ccx.te2000.cz/git/mrrl
Log | Files | Refs | Submodules | README
commit 882d292faba5d51c5592b5778df95937c51d6802
parent 40764e05bebbcda8227f5d3d2a4491026717260d
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Thu,  4 Dec 2025 21:37:24 +0000

gcc

Diffstat:

Dtemplates/.swl | 0


Mtemplates/package_sets | 3+++


Mtemplates/pkg/gcc | 1+


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 | 196+++++++++++++++++++++++++++++++++++++++----------------------------------------


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


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


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 | 1+


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/nvi | 68+++++++++++++++++++++++++++++++++-----------------------------------


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 | 74++++++++++++++++++++++++++++++++++++--------------------------------------


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 | 70++++++++++++++++++++++++++++++++++------------------------------------


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 | 184+++++++++++++++++++++++++++++++++++++++----------------------------------------


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 | 196+++++++++++++++++++++++++++++++++++++++----------------------------------------


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


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


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 | 1+


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/nvi | 68+++++++++++++++++++++++++++++++++-----------------------------------


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 | 74++++++++++++++++++++++++++++++++++++--------------------------------------


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 | 70++++++++++++++++++++++++++++++++++------------------------------------


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 | 184+++++++++++++++++++++++++++++++++++++++----------------------------------------


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+++++++++++++++++++++++++++++++---------------------------------


324 files changed, 7428 insertions(+), 7770 deletions(-)

diff --git a/templates/.swl b/templates/.swl
Binary files differ.
diff --git a/templates/package_sets b/templates/package_sets
@@ -19,9 +19,12 @@
 {%- endmacro %}
 
 {% macro toolchain() -%}
+#+{{pkg_install_name("musl-cross-make")}}
+{#-
 #+{{pkg_install_name("musl")}}
 #+{{pkg_install_name("gcc")}}
 #+{{pkg_install_name("binutils")}}
+-#}
 {%- endmacro %}
 
 {% macro busybox_compress() -%}
diff --git a/templates/pkg/gcc b/templates/pkg/gcc
@@ -50,6 +50,7 @@ build_env_static
 	--enable-initfini-array \
 	--enable-libstdcxx-time=rt \
 	--with-native-system-header-dir="$musl/{{includedir}}" \
+	--with-build-time-tools="$pthbs_build_environment/command" \
 	CFLAGS="-std=gnu17 -g0 -O2 -static --static" \
 	CXXFLAGS="-std=gnu++11 -g0 -O2 -static --static" \
 	FFLAGS="-g0 -O2" \
diff --git a/variants/ccx-x86_64/aat b/variants/ccx-x86_64/aat
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+zsh.a875624a8c2f5f6c6604d187871191282ec0e508a04e02e50da940feb57a5e55
-#+pthbs-banginstall.7f65c9c54e1db4b91d35f49dccb3183fc217c97a8617623a56b58c810608fd01
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+zsh.7a1f16b02b56803d6ca36a1b1dc69ca475e25d7c7c7768a1112c65aefab218c7
+#+pthbs-banginstall.6ad862dde53fc43fdf0a40361245db79b9eac3132f2508bdfa634801dccfd145
 #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat
 
 
diff --git a/variants/ccx-x86_64/abduco b/variants/ccx-x86_64/abduco
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
 #@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.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
 #@git:c7b36ed27103ee3f9aa01905ba1fac2d606079cf:alpine-keys
 
 
diff --git a/variants/ccx-x86_64/apk-tools b/variants/ccx-x86_64/apk-tools
@@ -1,41 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+patch.7cee5060701fe40e46976123b129248ae396e91511c0c4344e76ebb8a10d498e
-#+libressl.3ee18387381a6e865f9cc9d7ef9b035d2700a552724d28c3807fd93ac01cd164
-#+zstd.ba081e138e6ae4445d23365c271ad71a3dd85ec47d1de90c053b4c4863b01d2a
-#+pkgconf-pkg-config.5b602480e706af645071762d9b1551932f277d981f9a628d3528fd303fe5b0bb
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+patch.c171fc1f5a838cffcbf2f7960012733c75560bed300b010582b0bc4029688d11
+#+libressl.7b4860d5321ed95c9f8056ac6ca46f2726066c82339065d89aa65619f45b12f7
+#+zstd.fd3557864d85f019682e733bbdfa57a9aecb76b399f7136be5db7e75ba3180c7
+#+pkgconf-pkg-config.7a3098acfd74332fd15ada57749e6427388f516defc07c6475c22c6babd34fdb
 #@sha256:4b32a05f12c3d29befb210c88c415f7c7affd7e351b9e96b0cfde50773d22dbd:apk-tools.patch
 #@git:9d074efdc12bc41b5d24190595a5269a770e852a:apk-tools
 
diff --git a/variants/ccx-x86_64/applyuidgid-caps b/variants/ccx-x86_64/applyuidgid-caps
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+skalibs.12b87c93b239db5c4b37cecae9e5cf32f3231d65c42da4cf22fb99ff7fba4137
-#+libcap.cdd62774cf0b1502e1d8f06b7a8222d53958e71b3753b7f7090fc2854efa923e
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+skalibs.f29096c5595e6633734737f4152fa758742e31cea13fc7c417ead0cb84bab142
+#+libcap.ee2b20ff028cdbfa5b09db3834a9500eb678963ee972af38c46a2a000d9c61ee
 #@sha256:818a5ad7061ab1a740a5c2e7d7d8cdcc7be7e84e3f04b479731cf94ff1f1d093:applyuidgid-caps.c
 
 
diff --git a/variants/ccx-x86_64/argp-standalone b/variants/ccx-x86_64/argp-standalone
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+m4.9884105ada49333b0deef12f7fe3fef237616eb1f4de54543842fa6e66751a42
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+m4.d59e91d2b05cad279f2386e2c5c6f7379312c9bbeb3a1736669dd68e973e0d20
 #@untar:-z:sha256:c29eae929dfebd575c38174f2c8c315766092cec99a8f987569d0cad3c6d64f6:.
 #@untar::sha256:a4facc0856b512ad8ab5aed7b07e14a9629aaf042b1e92377ba22fcfc4c4205b:argp-standalone-1.5.0
 
diff --git a/variants/ccx-x86_64/attr b/variants/ccx-x86_64/attr
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+m4.9884105ada49333b0deef12f7fe3fef237616eb1f4de54543842fa6e66751a42
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+m4.d59e91d2b05cad279f2386e2c5c6f7379312c9bbeb3a1736669dd68e973e0d20
 #@untar:-z:sha256:39bf67452fa41d0948c2197601053f48b3d78a029389734332a6309a680c6c87:.
 
 
diff --git a/variants/ccx-x86_64/bison b/variants/ccx-x86_64/bison
@@ -1,39 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+m4.9884105ada49333b0deef12f7fe3fef237616eb1f4de54543842fa6e66751a42
-#+flex.5394cba91edc6b9f5157ff4b94b03b76ed9de8768386d78d1d220acf2f37a13c
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+m4.d59e91d2b05cad279f2386e2c5c6f7379312c9bbeb3a1736669dd68e973e0d20
+#+flex.85b7562cb29181ca685ee6e9e4b925ee9eb499989a6b65fac8ae9a07880302c9
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
 
diff --git a/variants/ccx-x86_64/busybox b/variants/ccx-x86_64/busybox
@@ -1,7 +1,5 @@
 #!/usr/bin/env pthbs-build
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
 #+gnu-make.14802bec28edc645ca1a7a23446f40dab46713a04ef11560c6ad30dedc6501d1
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
 #@sha256:31b8f61d2173fa36d4409e8e91f52088691d6ba4db13efe19ea7ae7512e64275:busybox/.config
diff --git a/variants/ccx-x86_64/busybox-ash b/variants/ccx-x86_64/busybox-ash
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-attr b/variants/ccx-x86_64/busybox-attr
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-awk b/variants/ccx-x86_64/busybox-awk
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-bc b/variants/ccx-x86_64/busybox-bc
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-bzip2 b/variants/ccx-x86_64/busybox-bzip2
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-chpst b/variants/ccx-x86_64/busybox-chpst
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-console b/variants/ccx-x86_64/busybox-console
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-coreutils b/variants/ccx-x86_64/busybox-coreutils
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-coreutils-extra b/variants/ccx-x86_64/busybox-coreutils-extra
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-cpio b/variants/ccx-x86_64/busybox-cpio
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-cron b/variants/ccx-x86_64/busybox-cron
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-daemontools b/variants/ccx-x86_64/busybox-daemontools
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-diffutils b/variants/ccx-x86_64/busybox-diffutils
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-dosfstools b/variants/ccx-x86_64/busybox-dosfstools
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-dpkg b/variants/ccx-x86_64/busybox-dpkg
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-e2fsprogs b/variants/ccx-x86_64/busybox-e2fsprogs
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-ed b/variants/ccx-x86_64/busybox-ed
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-findutils b/variants/ccx-x86_64/busybox-findutils
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-getty b/variants/ccx-x86_64/busybox-getty
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-grep b/variants/ccx-x86_64/busybox-grep
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-gzip b/variants/ccx-x86_64/busybox-gzip
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-i2c-tools b/variants/ccx-x86_64/busybox-i2c-tools
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-iproute2 b/variants/ccx-x86_64/busybox-iproute2
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-iputils b/variants/ccx-x86_64/busybox-iputils
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-kbd b/variants/ccx-x86_64/busybox-kbd
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-linux-extra b/variants/ccx-x86_64/busybox-linux-extra
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-logging b/variants/ccx-x86_64/busybox-logging
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-login b/variants/ccx-x86_64/busybox-login
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-lzop b/variants/ccx-x86_64/busybox-lzop
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-misc b/variants/ccx-x86_64/busybox-misc
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-modutils b/variants/ccx-x86_64/busybox-modutils
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-mtd-utils b/variants/ccx-x86_64/busybox-mtd-utils
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-net-misc b/variants/ccx-x86_64/busybox-net-misc
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-net-tools b/variants/ccx-x86_64/busybox-net-tools
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-process-extra b/variants/ccx-x86_64/busybox-process-extra
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-procps b/variants/ccx-x86_64/busybox-procps
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-psmisc b/variants/ccx-x86_64/busybox-psmisc
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-rpm b/variants/ccx-x86_64/busybox-rpm
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-sed b/variants/ccx-x86_64/busybox-sed
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-sh b/variants/ccx-x86_64/busybox-sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-shadow b/variants/ccx-x86_64/busybox-shadow
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-su b/variants/ccx-x86_64/busybox-su
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-tar b/variants/ccx-x86_64/busybox-tar
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-traceroute b/variants/ccx-x86_64/busybox-traceroute
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-unzip b/variants/ccx-x86_64/busybox-unzip
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-util-linux-priv b/variants/ccx-x86_64/busybox-util-linux-priv
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-util-linux-unpriv b/variants/ccx-x86_64/busybox-util-linux-unpriv
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-vi b/variants/ccx-x86_64/busybox-vi
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-wget b/variants/ccx-x86_64/busybox-wget
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-xxd b/variants/ccx-x86_64/busybox-xxd
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-xz b/variants/ccx-x86_64/busybox-xz
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox:modutils b/variants/ccx-x86_64/busybox:modutils
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+linux-qemu-guest.daf8c8e960434ebac0990c656f5c27ad0d8ac7831d0a3d8c35910e372e934cf0
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
+#+linux-qemu-guest.f7037bf8627090edbe9121fd443cad9c7603f7fa66cf338c9f8c957ff9fd5a46
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
 #@sha256:ccb459010923e1a9b49cb39d45bc93d0fc8749acea6efd7b19cfb00e76a5562e:busybox/.config
 #@git:3621595939e43a831d66f6b757d4f410029bff95:busybox
 
@@ -62,7 +60,7 @@ export CFLAGS="-D_GNU_SOURCE"
 export LDFLAGS="-static"
 # TODO: indirection via deps directory/symlink
 cat >>.config <<EOF
-CONFIG_DEFAULT_MODULES_DIR="/home/ccx/versions/linux-qemu-guest.daf8c8e960434ebac0990c656f5c27ad0d8ac7831d0a3d8c35910e372e934cf0"
+CONFIG_DEFAULT_MODULES_DIR="/home/ccx/versions/linux-qemu-guest.f7037bf8627090edbe9121fd443cad9c7603f7fa66cf338c9f8c957ff9fd5a46"
 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.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+certdata2pem.feb2f3725e4936a6ae950bda06907821b07151fddd264de32e4cd1bdf981154f
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+certdata2pem.7574788c02af147bb27b84e1d88a05eb8269b2a96de572102ad0db8edc7f9ee2
 #@untar:-j:sha256:6ef7bc56cc0e0b307d99a3c494119686091cc1d4ad08986d68aa089dd00c7788:.
 
 
diff --git a/variants/ccx-x86_64/ccx-utils b/variants/ccx-x86_64/ccx-utils
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+skalibs.12b87c93b239db5c4b37cecae9e5cf32f3231d65c42da4cf22fb99ff7fba4137
-#+s6.1065793dcf64a795110171081093831bf37a7515cd303333cf5f79acbc142442
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+skalibs.f29096c5595e6633734737f4152fa758742e31cea13fc7c417ead0cb84bab142
+#+s6.01596fe30512c19492c69acff5d240a57c7bb941df5926c9af1d108109a899ff
 #@git:461a9ec198c1e2b9c39a34e21786747dbb8671b4:ccx-utils
 
 
diff --git a/variants/ccx-x86_64/certdata2pem b/variants/ccx-x86_64/certdata2pem
@@ -1,35 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
 #@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.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+zsh.a875624a8c2f5f6c6604d187871191282ec0e508a04e02e50da940feb57a5e55
-#+pthbs-banginstall.7f65c9c54e1db4b91d35f49dccb3183fc217c97a8617623a56b58c810608fd01
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+zsh.7a1f16b02b56803d6ca36a1b1dc69ca475e25d7c7c7768a1112c65aefab218c7
+#+pthbs-banginstall.6ad862dde53fc43fdf0a40361245db79b9eac3132f2508bdfa634801dccfd145
 #@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.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-dosfstools.dd4473fcd36714d5c7f48b24c741e9ff25cab8191b8a938120e6555358abaf36
-#+busybox-e2fsprogs.af22f5bfb127967d2c7cb085c11adf98c57952c67846eb568e3ee70bc0800ff4
-#+busybox-iproute2.429a54bf32fac8265b9ca927bae4b7de3af3c5fd9f061a2fa09ac6ba4cfb0547
-#+busybox-iputils.a132882568c16da450b40217627056d9ab070c4a970f27abb67956399e9bb896
-#+busybox-net-misc.e18fe87c787fea5b381f41bb4c5954045853eb5bd036da9ba7d675f5e1667d25
-#+busybox-net-tools.d32bd10ba3881ec71014104edfb977f42e6cfa60dddd407a4b6a81960843bf91
-#+busybox-traceroute.9410980bf85a580538648c725dff21fa68ab62a6ee0f499a1f53b2944fc81356
-#+busybox-wget.82b2601c8a223795dca073c9ebd794bd0a3a4c6d56daef0703f1e19a85b0fe4d
-#+busybox-chpst.22a5d86c0153999d56e756e2e300f10926171c73561cc434f676564ef615bd19
-#+busybox-console.c888a0d94712bbb705b47a277932b730c5302692d11c5dac15a2c8349807d750
-#+busybox-getty.5eed966a1ab5735ab0e1220c7c38e0dc961314edc9629164a58cc77db59ddea1
-#+busybox-i2c-tools.fe087d9620ca5d880fb6cfad84a4ed3ffff59aeffa8aa9d125653fd88b71879c
-#+busybox-linux-extra.10eb4aee15f17e8760b4685f4723cf489123d4d07bae35ce02be5549b905e721
-#+busybox-mtd-utils.201ace78153d39f20186375eef6f2b124307577b94dd7b37e98fb268d8a28f10
-#+busybox-shadow.54ec8e7c4864053589e7fced125ddb03c45c689e1fb1bd4c142e0df47cd963ef
-#+busybox-su.79d4e9637cc186124e8d1a5b72a77ab5f2232dcab7b29b5c797606f424ccfb80
-#+busybox-util-linux-priv.b323daa42a69e3ed4caed2626972642973591c3b6bd5cb9963c249476e4e032e
-#+busybox-logging.a007ecfbd910e6146552d52a06facbd893f7174e6bfe08c395998952f5858542
-#+busybox-cron.c31902ab827a3f2591cac4667ff928e8aa27cca83fec9c883c91778c226d1364
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-login.2d9290aabd011fefbf6b272a8b9700176c82a048084da3afec98bdaf2800d357
-#+execline.ef45cef283c1f6e9c24e90b2ef0b66431057f5869041bb90c2e6ded169f6708d
-#+s6.1065793dcf64a795110171081093831bf37a7515cd303333cf5f79acbc142442
-#+ccx-utils.21237b0f8b8c1dfd83b8740ea037c854eefd766d9880e6bdeae8ec2314dfadb6
-#+applyuidgid-caps.f9effcbe51b46c1df309463d3c29e36311623bd7f12db9d3cc98247af81d5f4a
-#+easyseccomp.4cbf26fb354b49c842499a696a358c378f0f3f60baf4f368d9d547d41af508ea
-#+mlog.4a43328f8aee6e61c66e2b8884b90ad3b6e019cc26401407eb2be6c4e41c2c5c
-#+abduco.e614b10f4b0deaa7b7660430fbb38efc99f272017ee488adadb27d85b89365c6
-#+nawk.764be91418272983788a47036400b02fd0853b73c0d25e1f87c5f4d8474f2193
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-dosfstools.c9bcaf4a1c2a95450d2fb53581257bf27bcb4c84824c6387e0908c257a932606
+#+busybox-e2fsprogs.54bb7d820303164a42bb414da0ef6749ec1e45d18d06a4b1694e01c38d3447a2
+#+busybox-iproute2.e1c6f823cc7247a2b8345054ca275d4706c4ec4c38d4c359a6b70c0a9f87cab8
+#+busybox-iputils.eb83990d46a3e9089442c7c3ff21539c64bc14d72d02aa48f60e665fa96fe216
+#+busybox-net-misc.791629de33700b1680c0c30e447ac11ca32ede8598b778810aac996e2bef3745
+#+busybox-net-tools.bdd60aee6a8ebaf6e3ed92caba9392d1edce09d5932eeb821fe73f8c2fb7d6ec
+#+busybox-traceroute.9b80dcf8781a63ca32be4152f8e9d0d893e65f52406fdf86e043f432c62b0d9e
+#+busybox-wget.7d365291da2f48646b1d18b9540cc7db9affe94fe849cb0e7daad3edbf7adf63
+#+busybox-chpst.09e7e45709fe060f689cd5eac9ce991fcf698b5b52acf02a65d4e6a43df29ece
+#+busybox-console.70083328c37eb6d45a5c310bf82e2241db91bb0c3f92266098887f4057552815
+#+busybox-getty.7e72fd0b61d1b84e58398e3e3bc3361a2192186722f8f4198fffc7e15003ff66
+#+busybox-i2c-tools.7a62f5b7ece736a528b4d5c39e6904d4b402e6da18a76a4a7b810a4ef1fc278a
+#+busybox-linux-extra.e4b51d3b44f20986326fd139c01649adfeeeeabe9c5d1570ba0226bfd308c416
+#+busybox-mtd-utils.14405293cae08da608e53ddc588c548f06899fcad2909ae684cc78f182af2bb1
+#+busybox-shadow.2ed3fcd69aeac846360ff923e5c4b4102570666f4df3e37244ab0e1ae027a75a
+#+busybox-su.d4fd0607e561de1ce676ba4ba1cc8a30491f92c5f59f48fd964b79a0831793b2
+#+busybox-util-linux-priv.411e3711b3bf8bff170b53dd5b5a75b926bc7d8be4cbff50c8edfe52a290772d
+#+busybox-logging.358c37382f44a62fc90c614f2ab489f6d3d0f20ab08e5837c65da54f1ac9c4de
+#+busybox-cron.db4dc6cdd1b0f7ae42abac61a297afd2d3a917e3a44216a8ae889d4282df9ee2
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-login.c1cc590e722da9ccc4e42b7278617c63ebb4d04631a60f1a9ef109318a504dc5
+#+execline.475e8a451084e740445e652be569304b5253cb7ea54f346d356f11f5e1ea03f9
+#+s6.01596fe30512c19492c69acff5d240a57c7bb941df5926c9af1d108109a899ff
+#+ccx-utils.006c7ef351618261d80134c5d57ebad1638f9d88751519e285f453cf5989321c
+#+applyuidgid-caps.9bed1d6c14bf56c2afb714610d64ac9916a59af676067dda556c0688893c06b8
+#+easyseccomp.92dbf9729a2a84a27e0ba4891857081b97358ae93bd1b28514cd1f12c8adb0ce
+#+mlog.b19670b8c896b53e57e11aa401dd78175500593767f343a8416c592984bc62f1
+#+abduco.cf663ada10679850a3f8c9d18c756a1837bdecde02fb5b12d98366a50e7821fc
+#+nawk.346b8032668ae11dc1b3c55e656fb59bd37bf644a3b7a7d4e8cacc67cd1f7d3c
 #@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.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+zsh.a875624a8c2f5f6c6604d187871191282ec0e508a04e02e50da940feb57a5e55
-#+pthbs-banginstall.7f65c9c54e1db4b91d35f49dccb3183fc217c97a8617623a56b58c810608fd01
-#+execline.ef45cef283c1f6e9c24e90b2ef0b66431057f5869041bb90c2e6ded169f6708d
-#+alpine-keys.6e6610d2cdb8e34155693bf0b76370424145029d3b7a161f2b1044ae1934ef07
-#+apk-tools.0befde118ec55cc0f336d0a9a7fd40766d7c128d79d876a405d076549e98e981
-#+xbps.82082023ff204d2260baae1074d0ca7b5d3cfa59b9f90debceadd2da58b72374
-#+container-bin-image.ef3aae4409792a1b8052a5d97a6bdfef7a4830494f5fa636baa6683b404b8eff
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+zsh.7a1f16b02b56803d6ca36a1b1dc69ca475e25d7c7c7768a1112c65aefab218c7
+#+pthbs-banginstall.6ad862dde53fc43fdf0a40361245db79b9eac3132f2508bdfa634801dccfd145
+#+execline.475e8a451084e740445e652be569304b5253cb7ea54f346d356f11f5e1ea03f9
+#+alpine-keys.d626b34b8110940aaf8c386731a9fad48d845dd1836fb2e92f79334fb0bef4b1
+#+apk-tools.bdcdcedb47c9a1b15f3ec6596489456cb72265c1cd284c264be2efd31fcf1f0c
+#+xbps.5c7933c67ccbc1ef4a926f452cf03e4355ab4353861a603ed33b6ba19120c30f
+#+container-bin-image.f7a819fd1641378b40084844359fa8b07e8701d83262776647071ebc48960f9f
 #@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.0befde118ec55cc0f336d0a9a7fd40766d7c128d79d876a405d076549e98e981/command/apk.static' "${dest}/deps/command/"
-ln -sf '/home/ccx/versions/xbps.82082023ff204d2260baae1074d0ca7b5d3cfa59b9f90debceadd2da58b72374/command/xbps-install.static' "${dest}/deps/command/"
+ln -sf '/home/ccx/versions/apk-tools.bdcdcedb47c9a1b15f3ec6596489456cb72265c1cd284c264be2efd31fcf1f0c/command/apk.static' "${dest}/deps/command/"
+ln -sf '/home/ccx/versions/xbps.5c7933c67ccbc1ef4a926f452cf03e4355ab4353861a603ed33b6ba19120c30f/command/xbps-install.static' "${dest}/deps/command/"
 
-for f in '/home/ccx/versions/alpine-keys.6e6610d2cdb8e34155693bf0b76370424145029d3b7a161f2b1044ae1934ef07'/keys/alpine/*/*; do
+for f in '/home/ccx/versions/alpine-keys.d626b34b8110940aaf8c386731a9fad48d845dd1836fb2e92f79334fb0bef4b1'/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.6e6610d2cdb8e34155693bf0b76370424145029
 done
  
 mkdir -p "${dest}/deps/keys/void"
-for f in '/home/ccx/versions/xbps.82082023ff204d2260baae1074d0ca7b5d3cfa59b9f90debceadd2da58b72374'/keys/void/*; do
+for f in '/home/ccx/versions/xbps.5c7933c67ccbc1ef4a926f452cf03e4355ab4353861a603ed33b6ba19120c30f'/keys/void/*; do
 	ln -sf "$f" "${dest}/deps/keys/void/"
 done
 
-test -d '/home/ccx/versions/container-bin-image.ef3aae4409792a1b8052a5d97a6bdfef7a4830494f5fa636baa6683b404b8eff/container-bin-image'
-test -f '/home/ccx/versions/container-bin-image.ef3aae4409792a1b8052a5d97a6bdfef7a4830494f5fa636baa6683b404b8eff/container-bin-image/if'
-ln -sf '/home/ccx/versions/container-bin-image.ef3aae4409792a1b8052a5d97a6bdfef7a4830494f5fa636baa6683b404b8eff/container-bin-image' "${dest}/deps/"
+test -d '/home/ccx/versions/container-bin-image.f7a819fd1641378b40084844359fa8b07e8701d83262776647071ebc48960f9f/container-bin-image'
+test -f '/home/ccx/versions/container-bin-image.f7a819fd1641378b40084844359fa8b07e8701d83262776647071ebc48960f9f/container-bin-image/if'
+ln -sf '/home/ccx/versions/container-bin-image.f7a819fd1641378b40084844359fa8b07e8701d83262776647071ebc48960f9f/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.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-dosfstools.dd4473fcd36714d5c7f48b24c741e9ff25cab8191b8a938120e6555358abaf36
-#+busybox-e2fsprogs.af22f5bfb127967d2c7cb085c11adf98c57952c67846eb568e3ee70bc0800ff4
-#+busybox-iproute2.429a54bf32fac8265b9ca927bae4b7de3af3c5fd9f061a2fa09ac6ba4cfb0547
-#+busybox-iputils.a132882568c16da450b40217627056d9ab070c4a970f27abb67956399e9bb896
-#+busybox-net-misc.e18fe87c787fea5b381f41bb4c5954045853eb5bd036da9ba7d675f5e1667d25
-#+busybox-net-tools.d32bd10ba3881ec71014104edfb977f42e6cfa60dddd407a4b6a81960843bf91
-#+busybox-traceroute.9410980bf85a580538648c725dff21fa68ab62a6ee0f499a1f53b2944fc81356
-#+busybox-wget.82b2601c8a223795dca073c9ebd794bd0a3a4c6d56daef0703f1e19a85b0fe4d
-#+busybox-chpst.22a5d86c0153999d56e756e2e300f10926171c73561cc434f676564ef615bd19
-#+busybox-console.c888a0d94712bbb705b47a277932b730c5302692d11c5dac15a2c8349807d750
-#+busybox-getty.5eed966a1ab5735ab0e1220c7c38e0dc961314edc9629164a58cc77db59ddea1
-#+busybox-i2c-tools.fe087d9620ca5d880fb6cfad84a4ed3ffff59aeffa8aa9d125653fd88b71879c
-#+busybox-linux-extra.10eb4aee15f17e8760b4685f4723cf489123d4d07bae35ce02be5549b905e721
-#+busybox-mtd-utils.201ace78153d39f20186375eef6f2b124307577b94dd7b37e98fb268d8a28f10
-#+busybox-shadow.54ec8e7c4864053589e7fced125ddb03c45c689e1fb1bd4c142e0df47cd963ef
-#+busybox-su.79d4e9637cc186124e8d1a5b72a77ab5f2232dcab7b29b5c797606f424ccfb80
-#+busybox-util-linux-priv.b323daa42a69e3ed4caed2626972642973591c3b6bd5cb9963c249476e4e032e
-#+busybox-logging.a007ecfbd910e6146552d52a06facbd893f7174e6bfe08c395998952f5858542
-#+busybox-cron.c31902ab827a3f2591cac4667ff928e8aa27cca83fec9c883c91778c226d1364
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+execline.ef45cef283c1f6e9c24e90b2ef0b66431057f5869041bb90c2e6ded169f6708d
-#+s6.1065793dcf64a795110171081093831bf37a7515cd303333cf5f79acbc142442
-#+s6-portable-utils.08076985e02dc42224da4d457c978d96fdd9e09448abbec1497eb7ce55e62984
-#+s6-linux-utils.a71b562f8f72d67e5649e593d77a25f6fb1947fab8bbbb7419d7e356a95571b2
-#+zsh.a875624a8c2f5f6c6604d187871191282ec0e508a04e02e50da940feb57a5e55
-#+confz.a195c62dc3438e337842c4a9448f3e3fb77c787a877647e170632c4f24a90039
-#+containers.bb29ebb788517e9e167c2d94dc91740c3e198ae26d291b65ce8e25d45e719929
-#+xbps.82082023ff204d2260baae1074d0ca7b5d3cfa59b9f90debceadd2da58b72374
-#+zstd.ba081e138e6ae4445d23365c271ad71a3dd85ec47d1de90c053b4c4863b01d2a
-#+apk-tools.0befde118ec55cc0f336d0a9a7fd40766d7c128d79d876a405d076549e98e981
-#+alpine-keys.6e6610d2cdb8e34155693bf0b76370424145029d3b7a161f2b1044ae1934ef07
-#+getent.23c84f01bbd623c59c9501258f3160189710dd5a934271e3104de7ad533decc6
-#+fileset.7ca18435d5ef61f9818d2d6624e2ae2544719a78b18f4e62cb32f16fb47a9184
-#+ccx-utils.21237b0f8b8c1dfd83b8740ea037c854eefd766d9880e6bdeae8ec2314dfadb6
-#+easyseccomp.4cbf26fb354b49c842499a696a358c378f0f3f60baf4f368d9d547d41af508ea
-#+findutils.9c194f156f0d27d3da7a8be576b0ea570bfae300591a1260bbb4e281d1ec1410
-#+nawk.764be91418272983788a47036400b02fd0853b73c0d25e1f87c5f4d8474f2193-
\ No newline at end of file
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-dosfstools.c9bcaf4a1c2a95450d2fb53581257bf27bcb4c84824c6387e0908c257a932606
+#+busybox-e2fsprogs.54bb7d820303164a42bb414da0ef6749ec1e45d18d06a4b1694e01c38d3447a2
+#+busybox-iproute2.e1c6f823cc7247a2b8345054ca275d4706c4ec4c38d4c359a6b70c0a9f87cab8
+#+busybox-iputils.eb83990d46a3e9089442c7c3ff21539c64bc14d72d02aa48f60e665fa96fe216
+#+busybox-net-misc.791629de33700b1680c0c30e447ac11ca32ede8598b778810aac996e2bef3745
+#+busybox-net-tools.bdd60aee6a8ebaf6e3ed92caba9392d1edce09d5932eeb821fe73f8c2fb7d6ec
+#+busybox-traceroute.9b80dcf8781a63ca32be4152f8e9d0d893e65f52406fdf86e043f432c62b0d9e
+#+busybox-wget.7d365291da2f48646b1d18b9540cc7db9affe94fe849cb0e7daad3edbf7adf63
+#+busybox-chpst.09e7e45709fe060f689cd5eac9ce991fcf698b5b52acf02a65d4e6a43df29ece
+#+busybox-console.70083328c37eb6d45a5c310bf82e2241db91bb0c3f92266098887f4057552815
+#+busybox-getty.7e72fd0b61d1b84e58398e3e3bc3361a2192186722f8f4198fffc7e15003ff66
+#+busybox-i2c-tools.7a62f5b7ece736a528b4d5c39e6904d4b402e6da18a76a4a7b810a4ef1fc278a
+#+busybox-linux-extra.e4b51d3b44f20986326fd139c01649adfeeeeabe9c5d1570ba0226bfd308c416
+#+busybox-mtd-utils.14405293cae08da608e53ddc588c548f06899fcad2909ae684cc78f182af2bb1
+#+busybox-shadow.2ed3fcd69aeac846360ff923e5c4b4102570666f4df3e37244ab0e1ae027a75a
+#+busybox-su.d4fd0607e561de1ce676ba4ba1cc8a30491f92c5f59f48fd964b79a0831793b2
+#+busybox-util-linux-priv.411e3711b3bf8bff170b53dd5b5a75b926bc7d8be4cbff50c8edfe52a290772d
+#+busybox-logging.358c37382f44a62fc90c614f2ab489f6d3d0f20ab08e5837c65da54f1ac9c4de
+#+busybox-cron.db4dc6cdd1b0f7ae42abac61a297afd2d3a917e3a44216a8ae889d4282df9ee2
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+execline.475e8a451084e740445e652be569304b5253cb7ea54f346d356f11f5e1ea03f9
+#+s6.01596fe30512c19492c69acff5d240a57c7bb941df5926c9af1d108109a899ff
+#+s6-portable-utils.797e111cabb6a43a2cb96cca14b66958a9d12463ae4e41e665461f6e279a91f7
+#+s6-linux-utils.4c36c0f4c6f60845cd973998719f5a2272f3c61c70a633898ea379201c318bf2
+#+zsh.7a1f16b02b56803d6ca36a1b1dc69ca475e25d7c7c7768a1112c65aefab218c7
+#+confz.6546b02dcdeb82b8ce2ceb97717bcd190f49badae871afe93ef4bd22386cf794
+#+containers.2a8d1e35eb4f4664154e3a04b887d5faffe3e8164e279f6d48be587c7452296b
+#+xbps.5c7933c67ccbc1ef4a926f452cf03e4355ab4353861a603ed33b6ba19120c30f
+#+zstd.fd3557864d85f019682e733bbdfa57a9aecb76b399f7136be5db7e75ba3180c7
+#+apk-tools.bdcdcedb47c9a1b15f3ec6596489456cb72265c1cd284c264be2efd31fcf1f0c
+#+alpine-keys.d626b34b8110940aaf8c386731a9fad48d845dd1836fb2e92f79334fb0bef4b1
+#+getent.91fcfeb24768a1115badb8115fd80dc7726dae72a5f90a568e3df50f3401045f
+#+fileset.43c46f269aacaee274e3a37de6fcdc1bd392d1968930297700a2e7743d078ce1
+#+ccx-utils.006c7ef351618261d80134c5d57ebad1638f9d88751519e285f453cf5989321c
+#+easyseccomp.92dbf9729a2a84a27e0ba4891857081b97358ae93bd1b28514cd1f12c8adb0ce
+#+findutils.784f4cae35b89b0a109b58c374a370d40a86b7fc91549afea7b82031164224f7
+#+nawk.346b8032668ae11dc1b3c55e656fb59bd37bf644a3b7a7d4e8cacc67cd1f7d3c+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/curl b/variants/ccx-x86_64/curl
@@ -1,39 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+m4.9884105ada49333b0deef12f7fe3fef237616eb1f4de54543842fa6e66751a42
-#+libressl.3ee18387381a6e865f9cc9d7ef9b035d2700a552724d28c3807fd93ac01cd164
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+m4.d59e91d2b05cad279f2386e2c5c6f7379312c9bbeb3a1736669dd68e973e0d20
+#+libressl.7b4860d5321ed95c9f8056ac6ca46f2726066c82339065d89aa65619f45b12f7
 #@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:.
 
 
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -1,99 +1,97 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-dosfstools.dd4473fcd36714d5c7f48b24c741e9ff25cab8191b8a938120e6555358abaf36
-#+busybox-e2fsprogs.af22f5bfb127967d2c7cb085c11adf98c57952c67846eb568e3ee70bc0800ff4
-#+busybox-iproute2.429a54bf32fac8265b9ca927bae4b7de3af3c5fd9f061a2fa09ac6ba4cfb0547
-#+busybox-iputils.a132882568c16da450b40217627056d9ab070c4a970f27abb67956399e9bb896
-#+busybox-net-misc.e18fe87c787fea5b381f41bb4c5954045853eb5bd036da9ba7d675f5e1667d25
-#+busybox-net-tools.d32bd10ba3881ec71014104edfb977f42e6cfa60dddd407a4b6a81960843bf91
-#+busybox-traceroute.9410980bf85a580538648c725dff21fa68ab62a6ee0f499a1f53b2944fc81356
-#+busybox-wget.82b2601c8a223795dca073c9ebd794bd0a3a4c6d56daef0703f1e19a85b0fe4d
-#+busybox-chpst.22a5d86c0153999d56e756e2e300f10926171c73561cc434f676564ef615bd19
-#+busybox-console.c888a0d94712bbb705b47a277932b730c5302692d11c5dac15a2c8349807d750
-#+busybox-getty.5eed966a1ab5735ab0e1220c7c38e0dc961314edc9629164a58cc77db59ddea1
-#+busybox-i2c-tools.fe087d9620ca5d880fb6cfad84a4ed3ffff59aeffa8aa9d125653fd88b71879c
-#+busybox-linux-extra.10eb4aee15f17e8760b4685f4723cf489123d4d07bae35ce02be5549b905e721
-#+busybox-mtd-utils.201ace78153d39f20186375eef6f2b124307577b94dd7b37e98fb268d8a28f10
-#+busybox-shadow.54ec8e7c4864053589e7fced125ddb03c45c689e1fb1bd4c142e0df47cd963ef
-#+busybox-su.79d4e9637cc186124e8d1a5b72a77ab5f2232dcab7b29b5c797606f424ccfb80
-#+busybox-util-linux-priv.b323daa42a69e3ed4caed2626972642973591c3b6bd5cb9963c249476e4e032e
-#+busybox-logging.a007ecfbd910e6146552d52a06facbd893f7174e6bfe08c395998952f5858542
-#+busybox-cron.c31902ab827a3f2591cac4667ff928e8aa27cca83fec9c883c91778c226d1364
-#+attr.fa7777627acb4e171762b37fc5f5914d97c69bc0888083d93cc812180ee7d6ed
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+diffutils.da2b4486fef6f10f6be614fc3bac358ac546f7d76ffc005e4a08b4f8a5e46580
-#+patch.7cee5060701fe40e46976123b129248ae396e91511c0c4344e76ebb8a10d498e
-#+flex.5394cba91edc6b9f5157ff4b94b03b76ed9de8768386d78d1d220acf2f37a13c
-#+bison.636e501a9f34a4a9bbd330542c82ab1c3c976aa060962e07c3f9bae008b3a4be
-#+rsync.4540ed2cf7259ea2a1baa33b66bb2f7756db99aa36bfec9fb276f0939be24d6a
-#+execline.ef45cef283c1f6e9c24e90b2ef0b66431057f5869041bb90c2e6ded169f6708d
-#+s6.1065793dcf64a795110171081093831bf37a7515cd303333cf5f79acbc142442
-#+s6-rc.512a619a9f8e797b02dd701e4cc00b8213f42de38f77eea85f0d2aa9f9cdb295
-#+s6-portable-utils.08076985e02dc42224da4d457c978d96fdd9e09448abbec1497eb7ce55e62984
-#+s6-linux-utils.a71b562f8f72d67e5649e593d77a25f6fb1947fab8bbbb7419d7e356a95571b2
-#+s6-linux-init.4bdcc8b61186e3231ccc6ca723ea9e7d6c4b6c5011f54f80eb8250a91aa016d8
-#+mdevd.3dc2ef3401ec6cec248695d657775fe278fcc95dd0ff225e537e42faab22783d
-#+s6-dns.bb7988982e46b616873e34c9defce1d3a78e62e865fc70c4ccb5633873d792ae
-#+libressl.3ee18387381a6e865f9cc9d7ef9b035d2700a552724d28c3807fd93ac01cd164
-#+s6-networking.8474a7f918c36a7cc539f2e56869d70b281e2091a2332c86264662e395759afb
-#+zsh.a875624a8c2f5f6c6604d187871191282ec0e508a04e02e50da940feb57a5e55
-#+pthbs-banginstall.7f65c9c54e1db4b91d35f49dccb3183fc217c97a8617623a56b58c810608fd01
-#+aat.c46f2bdc046083e46f49655db55f6c92acecea8d8169398933c45ba34515349d
-#+confz.a195c62dc3438e337842c4a9448f3e3fb77c787a877647e170632c4f24a90039
-#+containers.bb29ebb788517e9e167c2d94dc91740c3e198ae26d291b65ce8e25d45e719929
-#+fileset.7ca18435d5ef61f9818d2d6624e2ae2544719a78b18f4e62cb32f16fb47a9184
-#+logincaps.19343bd403730dc91a5fa19eac15f4730f030af3369f5bfede23ba94ca802e7b
-#+snaprep.c6d20a3c8b2544bd9ce73e175508c983471cdf116af6524eb57a3fe95cc57d73
-#+curl.4590ed098587dd94263001ad0710faaaf2fcad17e4a2ab31bc8b917ec4f9b225
-#+git.334b418c3265eff4d5c439c445e33e3d8d14c13c741f7d1c1f009f08898db615
-#+xbps.82082023ff204d2260baae1074d0ca7b5d3cfa59b9f90debceadd2da58b72374
-#+apk-tools.0befde118ec55cc0f336d0a9a7fd40766d7c128d79d876a405d076549e98e981
-#+getent.23c84f01bbd623c59c9501258f3160189710dd5a934271e3104de7ad533decc6
-#+getconf.2cf874cd3fe88746245e2607e6d6decfcd4260156ad3546dd83cd2246602ad4f
-#+iconv.4244e9cef51ba66e306019338bdfa3500c22a6d5e7f6eeb03fb742b29a7abe67
-#+libcap.cdd62774cf0b1502e1d8f06b7a8222d53958e71b3753b7f7090fc2854efa923e
-#+applyuidgid-caps.f9effcbe51b46c1df309463d3c29e36311623bd7f12db9d3cc98247af81d5f4a
-#+ccx-utils.21237b0f8b8c1dfd83b8740ea037c854eefd766d9880e6bdeae8ec2314dfadb6
-#+user-env.744865c18de697a566291f7f2e992dbace14628dcd6df4c8dbeed62fd9713363
-#+strace.5518caa2f8190f73c36ea0a0fa8dede6a20b884a6874ff62f362b0e3f2ea1c64
-#+mlog.4a43328f8aee6e61c66e2b8884b90ad3b6e019cc26401407eb2be6c4e41c2c5c
-#+findutils.9c194f156f0d27d3da7a8be576b0ea570bfae300591a1260bbb4e281d1ec1410
-#+nawk.764be91418272983788a47036400b02fd0853b73c0d25e1f87c5f4d8474f2193
-#+nvi.ff1c93525bb5fefc74586b23a58973e275e5b067a170ec1b4804df335f2787ca
-#+squashfs-tools.ba7a1172fda31f1c2e5d1ad4439477c0c97b2d43e1a336cfecf0fe8e67f407e2
-#+mandoc.04a47d5227be490a94ee7cd2265f9ca5ca0415386551448e6a06d63acdf390df
-#+tinyssh.dc937cfe83137dcfa7bb95da51aaa79fe03235d4f09b233e7b895b632af32054
-#+system-config.be7e4ecbac3efa19a2773ca1d02b3ea55561cb95e7653ac2a16dd3ae384e1872
-#+system-config-rc.15dc596d787a9468a7dccf5ddb2a68d3b7baa9573eb4751e4efd4122292cb593
-#+system-config-scripts.07d1c5ee6c6f8367095e0c677d563e22d1e8fb55bb94288040fafe9b9987b626
-#+system-config-init.92b5a7cd0e3f4e3c54460f587fc8465ca6037a69e35d664f6707e2a119bbb498
-#+system-config-zsh.3c7a9d70a6f7bd0bcb2e829dad384bec11ecab30f32e4f09526608dd170e5183
-#+busybox.cfdaf18fc9502934f45ead4ec69633a8e91ab94b210de5f95e96ae66bc58f2e4-
\ No newline at end of file
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-dosfstools.c9bcaf4a1c2a95450d2fb53581257bf27bcb4c84824c6387e0908c257a932606
+#+busybox-e2fsprogs.54bb7d820303164a42bb414da0ef6749ec1e45d18d06a4b1694e01c38d3447a2
+#+busybox-iproute2.e1c6f823cc7247a2b8345054ca275d4706c4ec4c38d4c359a6b70c0a9f87cab8
+#+busybox-iputils.eb83990d46a3e9089442c7c3ff21539c64bc14d72d02aa48f60e665fa96fe216
+#+busybox-net-misc.791629de33700b1680c0c30e447ac11ca32ede8598b778810aac996e2bef3745
+#+busybox-net-tools.bdd60aee6a8ebaf6e3ed92caba9392d1edce09d5932eeb821fe73f8c2fb7d6ec
+#+busybox-traceroute.9b80dcf8781a63ca32be4152f8e9d0d893e65f52406fdf86e043f432c62b0d9e
+#+busybox-wget.7d365291da2f48646b1d18b9540cc7db9affe94fe849cb0e7daad3edbf7adf63
+#+busybox-chpst.09e7e45709fe060f689cd5eac9ce991fcf698b5b52acf02a65d4e6a43df29ece
+#+busybox-console.70083328c37eb6d45a5c310bf82e2241db91bb0c3f92266098887f4057552815
+#+busybox-getty.7e72fd0b61d1b84e58398e3e3bc3361a2192186722f8f4198fffc7e15003ff66
+#+busybox-i2c-tools.7a62f5b7ece736a528b4d5c39e6904d4b402e6da18a76a4a7b810a4ef1fc278a
+#+busybox-linux-extra.e4b51d3b44f20986326fd139c01649adfeeeeabe9c5d1570ba0226bfd308c416
+#+busybox-mtd-utils.14405293cae08da608e53ddc588c548f06899fcad2909ae684cc78f182af2bb1
+#+busybox-shadow.2ed3fcd69aeac846360ff923e5c4b4102570666f4df3e37244ab0e1ae027a75a
+#+busybox-su.d4fd0607e561de1ce676ba4ba1cc8a30491f92c5f59f48fd964b79a0831793b2
+#+busybox-util-linux-priv.411e3711b3bf8bff170b53dd5b5a75b926bc7d8be4cbff50c8edfe52a290772d
+#+busybox-logging.358c37382f44a62fc90c614f2ab489f6d3d0f20ab08e5837c65da54f1ac9c4de
+#+busybox-cron.db4dc6cdd1b0f7ae42abac61a297afd2d3a917e3a44216a8ae889d4282df9ee2
+#+attr.e7c079e9b59db8fce55da674c6fb21bba141d16778256d1d751149414198c254
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+diffutils.5c134d14423ce2d3d0b682f78278ce79c8144de6ff2464b4aec16a03324c9bdb
+#+patch.c171fc1f5a838cffcbf2f7960012733c75560bed300b010582b0bc4029688d11
+#+flex.85b7562cb29181ca685ee6e9e4b925ee9eb499989a6b65fac8ae9a07880302c9
+#+bison.4f02e10e21e40e2a298c016d258e52074009b196cb656bfb69a391e67e241381
+#+rsync.f2bcc5a1d759b64ab0c241a3b13c8ba78b73bc2a7180270c15f4f793a086c1a5
+#+execline.475e8a451084e740445e652be569304b5253cb7ea54f346d356f11f5e1ea03f9
+#+s6.01596fe30512c19492c69acff5d240a57c7bb941df5926c9af1d108109a899ff
+#+s6-rc.74c39873dab64bc6b4f5097e78f3847ea1d6dc25030f7fc7b980e8cc1b168d5e
+#+s6-portable-utils.797e111cabb6a43a2cb96cca14b66958a9d12463ae4e41e665461f6e279a91f7
+#+s6-linux-utils.4c36c0f4c6f60845cd973998719f5a2272f3c61c70a633898ea379201c318bf2
+#+s6-linux-init.e4a9e398db1c57cd94a581ae6c0670b267010289e1e84959d0b372b855c637b1
+#+mdevd.4478a4f21e9273ab12be5c1ca7559cebd3742ea316266163e3a770a4c5044f62
+#+s6-dns.27ee81a55ba447d41d79f73aec9815508889443386175c34f81112aa7a2971e9
+#+libressl.7b4860d5321ed95c9f8056ac6ca46f2726066c82339065d89aa65619f45b12f7
+#+s6-networking.b2253acf5de717e72b4db1c14e931f26c7ab06b8c63f5174cf77b6bbf3cb0a46
+#+zsh.7a1f16b02b56803d6ca36a1b1dc69ca475e25d7c7c7768a1112c65aefab218c7
+#+pthbs-banginstall.6ad862dde53fc43fdf0a40361245db79b9eac3132f2508bdfa634801dccfd145
+#+aat.545e0046e030e9d58e673151ea3b28559a576eb1171f238877827ae1b766e11c
+#+confz.6546b02dcdeb82b8ce2ceb97717bcd190f49badae871afe93ef4bd22386cf794
+#+containers.2a8d1e35eb4f4664154e3a04b887d5faffe3e8164e279f6d48be587c7452296b
+#+fileset.43c46f269aacaee274e3a37de6fcdc1bd392d1968930297700a2e7743d078ce1
+#+logincaps.1e59e5c3c7d24dfbda81790497c5e2d4dc2574abe1f96e1f24b0fec8f0493426
+#+snaprep.10e08d7afd15dc4fe043ff1abceac3f24ff4d09d4a11f60daf3520de5ca1ecb8
+#+curl.77ab282a59d0565e190964bf40b28048f07089417f2dd7dc5d4fbc75bce27405
+#+git.1b65d8abd7f156a76a4497b37af4b3cedd4e52abf983255622eea63c9a522481
+#+xbps.5c7933c67ccbc1ef4a926f452cf03e4355ab4353861a603ed33b6ba19120c30f
+#+apk-tools.bdcdcedb47c9a1b15f3ec6596489456cb72265c1cd284c264be2efd31fcf1f0c
+#+getent.91fcfeb24768a1115badb8115fd80dc7726dae72a5f90a568e3df50f3401045f
+#+getconf.b3f1ba0a15d4320332d567bb1e008682a255b7574312579b214452aa314fdbc7
+#+iconv.abbe8cdc1036745b2d2040a911f963868d2ed9529e1ed87e20eb1cf4072b0df6
+#+libcap.ee2b20ff028cdbfa5b09db3834a9500eb678963ee972af38c46a2a000d9c61ee
+#+applyuidgid-caps.9bed1d6c14bf56c2afb714610d64ac9916a59af676067dda556c0688893c06b8
+#+ccx-utils.006c7ef351618261d80134c5d57ebad1638f9d88751519e285f453cf5989321c
+#+user-env.d9263c530a4cb34fb334eeabcdcbf4a92dda444ddc58d197d9572e31ac8de39b
+#+strace.43ab7a4ffdcf5cc91dbba8dd7bf567c2609b0b782a6230266a6036fbf1796f7d
+#+mlog.b19670b8c896b53e57e11aa401dd78175500593767f343a8416c592984bc62f1
+#+findutils.784f4cae35b89b0a109b58c374a370d40a86b7fc91549afea7b82031164224f7
+#+nawk.346b8032668ae11dc1b3c55e656fb59bd37bf644a3b7a7d4e8cacc67cd1f7d3c
+#+nvi.c534511cfe918db0623585fda0f381ff4be2bcc9f0dec0f1b6be19dd27a2b53f
+#+squashfs-tools.ab8227f3b68301695982b4778a05b5c50c73362170d14a3ce42ab2d475cfceb3
+#+mandoc.71e2183d5a24018d44d556c2d31dba72a0787ed2e59ba45621e7355ac62f7f0f
+#+tinyssh.425a0ff58a464815ba68ea5c62280210ff7dc2ed42d20b410b52c40b41e9f85d
+#+system-config.2248cd6ef22a788b5182a32fe8497d9d43bbdd1f1b533f4095e2da5f1e8a28fa
+#+system-config-rc.6f1ad2884329da7256190f91827fd5d194cf286a0f10d0cf0a99386011d16203
+#+system-config-scripts.cf6b7350cf83bc871ce6d1a882eff4543cc7b5a2e221b629cfdc023bfaca1522
+#+system-config-init.493b9642016be75045b915c007226642bce2de55158163fc41b726ca381fe584
+#+system-config-zsh.17647a18f3d58c021c05b0c89c732a94a32e6f997b4c3ba024a864a0c8cd6f66
+#+busybox.3c90b59fa1a12cd017d08d46cf2979d51c33a17d018f204f88d0e640192e7e31+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/diffutils b/variants/ccx-x86_64/diffutils
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+m4.9884105ada49333b0deef12f7fe3fef237616eb1f4de54543842fa6e66751a42
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+m4.d59e91d2b05cad279f2386e2c5c6f7379312c9bbeb3a1736669dd68e973e0d20
 #@untar:-J:sha256:90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e:.
 
 
diff --git a/variants/ccx-x86_64/dune b/variants/ccx-x86_64/dune
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.3b6c29bf3530515699f6d9591d53733d80e7e8d04469000a167c9cf54cf1f9ca
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+ocaml.f748973d16fcd129b5224672b1672d13d485218484b44b2259349ceecc47bcf0
 #@untar:-z:sha256:579c738f8ca191ba0a9b22dbe78f1377542442c9827cf4939f8964f09f9edb28:.
 
 
diff --git a/variants/ccx-x86_64/easyseccomp b/variants/ccx-x86_64/easyseccomp
@@ -1,44 +1,42 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+m4.9884105ada49333b0deef12f7fe3fef237616eb1f4de54543842fa6e66751a42
-#+patch.7cee5060701fe40e46976123b129248ae396e91511c0c4344e76ebb8a10d498e
-#+flex.5394cba91edc6b9f5157ff4b94b03b76ed9de8768386d78d1d220acf2f37a13c
-#+bison.636e501a9f34a4a9bbd330542c82ab1c3c976aa060962e07c3f9bae008b3a4be
-#+libseccomp.d8dee83056a69f5ece7d1b931f8bbca1506cdf903f7980212d3932782a47501f
-#+error-standalone.e4338d0e55df76a4db1ee28205f3db83ffb971470919894f21404593535024ca
-#+argp-standalone.fea172e79a064999701913b24572fe22543442b549d8b46bdbbca6396b0a03e4
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+m4.d59e91d2b05cad279f2386e2c5c6f7379312c9bbeb3a1736669dd68e973e0d20
+#+patch.c171fc1f5a838cffcbf2f7960012733c75560bed300b010582b0bc4029688d11
+#+flex.85b7562cb29181ca685ee6e9e4b925ee9eb499989a6b65fac8ae9a07880302c9
+#+bison.4f02e10e21e40e2a298c016d258e52074009b196cb656bfb69a391e67e241381
+#+libseccomp.d89ddac5edc4dd0aa588f4e14bcf3b3997a391c0408aadf8e96cd13168a0a265
+#+error-standalone.6eab70f1dfa50163055059e3790955954ee2b7716b000ae53f4f82cd91685be1
+#+argp-standalone.0036da25ae889feced1040eddff6628da3dfb8414f1aeb39d573c8ce11cc097b
 #@untar::sha256:1b44a63d415c48ac68d210951fec8d4761d3522f3d82d53182e66fabe5e2f2cd:easyseccomp
 #@sha256:eec15ac67403946e9d988d485f11764cf313b4798efe01d40f951ff521a23d10:easyseccomp_fix_includes.patch
 #@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp
diff --git a/variants/ccx-x86_64/error-standalone b/variants/ccx-x86_64/error-standalone
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
 #@untar:-z:sha256:0e751989cea94e25d5166a6a1ed9bde218786e39dff82e1f01dff12fc78639d9:.
 
 
diff --git a/variants/ccx-x86_64/execline b/variants/ccx-x86_64/execline
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+skalibs.12b87c93b239db5c4b37cecae9e5cf32f3231d65c42da4cf22fb99ff7fba4137
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+skalibs.f29096c5595e6633734737f4152fa758742e31cea13fc7c417ead0cb84bab142
 #@git:6c0957eb5e8eea2ffada4d7be08286f0e81d0527:execline
 
 
@@ -48,7 +46,7 @@ cd 'execline'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.12b87c93b239db5c4b37cecae9e5cf32f3231d65c42da4cf22fb99ff7fba4137/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.f29096c5595e6633734737f4152fa758742e31cea13fc7c417ead0cb84bab142/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.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+zsh.a875624a8c2f5f6c6604d187871191282ec0e508a04e02e50da940feb57a5e55
-#+pthbs-banginstall.7f65c9c54e1db4b91d35f49dccb3183fc217c97a8617623a56b58c810608fd01
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+zsh.7a1f16b02b56803d6ca36a1b1dc69ca475e25d7c7c7768a1112c65aefab218c7
+#+pthbs-banginstall.6ad862dde53fc43fdf0a40361245db79b9eac3132f2508bdfa634801dccfd145
 #@git:1b161b09bc889d17ac0a4ccce2dc3e74b64e1433:fileset
 
 
diff --git a/variants/ccx-x86_64/findutils b/variants/ccx-x86_64/findutils
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+m4.9884105ada49333b0deef12f7fe3fef237616eb1f4de54543842fa6e66751a42
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+m4.d59e91d2b05cad279f2386e2c5c6f7379312c9bbeb3a1736669dd68e973e0d20
 #@untar:-J:sha256:1387e0b67ff247d2abde998f90dfbf70c1491391a59ddfecb8ae698789f0a4f5:.
 
 
diff --git a/variants/ccx-x86_64/flex b/variants/ccx-x86_64/flex
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+m4.9884105ada49333b0deef12f7fe3fef237616eb1f4de54543842fa6e66751a42
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+m4.d59e91d2b05cad279f2386e2c5c6f7379312c9bbeb3a1736669dd68e973e0d20
 #@untar:-z:sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995:.
 
 
diff --git a/variants/ccx-x86_64/gcc b/variants/ccx-x86_64/gcc
@@ -72,6 +72,7 @@ build_env_static
 	--enable-initfini-array \
 	--enable-libstdcxx-time=rt \
 	--with-native-system-header-dir="$musl/include" \
+	--with-build-time-tools="$pthbs_build_environment/command" \
 	CFLAGS="-std=gnu17 -g0 -O2 -static --static" \
 	CXXFLAGS="-std=gnu++11 -g0 -O2 -static --static" \
 	FFLAGS="-g0 -O2" \
diff --git a/variants/ccx-x86_64/getconf b/variants/ccx-x86_64/getconf
@@ -1,35 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
 #@sha256:d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae50e320aad247c:getconf.c
 
 
diff --git a/variants/ccx-x86_64/getent b/variants/ccx-x86_64/getent
@@ -1,35 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
 #@sha256:002c1a216f6bed0f816ab1cfebde94a0b127193ef410c36b2190599983e015b8:getent.c
 
 
diff --git a/variants/ccx-x86_64/git b/variants/ccx-x86_64/git
@@ -1,40 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+m4.9884105ada49333b0deef12f7fe3fef237616eb1f4de54543842fa6e66751a42
-#+libressl.3ee18387381a6e865f9cc9d7ef9b035d2700a552724d28c3807fd93ac01cd164
-#+curl.4590ed098587dd94263001ad0710faaaf2fcad17e4a2ab31bc8b917ec4f9b225
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+m4.d59e91d2b05cad279f2386e2c5c6f7379312c9bbeb3a1736669dd68e973e0d20
+#+libressl.7b4860d5321ed95c9f8056ac6ca46f2726066c82339065d89aa65619f45b12f7
+#+curl.77ab282a59d0565e190964bf40b28048f07089417f2dd7dc5d4fbc75bce27405
 #@untar:-J:sha256:f612c1abc63557d50ad3849863fc9109670139fc9901e574460ec76e0511adb9:.
 
 
diff --git a/variants/ccx-x86_64/gnu-make b/variants/ccx-x86_64/gnu-make
@@ -1,7 +1,5 @@
 #!/usr/bin/env pthbs-build
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
 #+gnu-make.14802bec28edc645ca1a7a23446f40dab46713a04ef11560c6ad30dedc6501d1
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
diff --git a/variants/ccx-x86_64/gperf b/variants/ccx-x86_64/gperf
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+m4.9884105ada49333b0deef12f7fe3fef237616eb1f4de54543842fa6e66751a42
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+m4.d59e91d2b05cad279f2386e2c5c6f7379312c9bbeb3a1736669dd68e973e0d20
 #@untar:-z:sha256:588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2:.
 
 
diff --git a/variants/ccx-x86_64/iconv b/variants/ccx-x86_64/iconv
@@ -1,35 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
 #@sha256:f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7:iconv.c
 
 
diff --git a/variants/ccx-x86_64/kbd b/variants/ccx-x86_64/kbd
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+m4.9884105ada49333b0deef12f7fe3fef237616eb1f4de54543842fa6e66751a42
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+m4.d59e91d2b05cad279f2386e2c5c6f7379312c9bbeb3a1736669dd68e973e0d20
 #@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.daf8c8e960434ebac0990c656f5c27ad0d8ac7831d0a3d8c35910e372e934cf0
-#+busybox.cfdaf18fc9502934f45ead4ec69633a8e91ab94b210de5f95e96ae66bc58f2e4-
\ No newline at end of file
+#+linux-qemu-guest.f7037bf8627090edbe9121fd443cad9c7603f7fa66cf338c9f8c957ff9fd5a46
+#+busybox.3c90b59fa1a12cd017d08d46cf2979d51c33a17d018f204f88d0e640192e7e31+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/libarchive b/variants/ccx-x86_64/libarchive
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+m4.9884105ada49333b0deef12f7fe3fef237616eb1f4de54543842fa6e66751a42
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+m4.d59e91d2b05cad279f2386e2c5c6f7379312c9bbeb3a1736669dd68e973e0d20
 #@untar:-J:sha256:04357661e6717b6941682cde02ad741ae4819c67a260593dfb2431861b251acb:.
 
 
diff --git a/variants/ccx-x86_64/libbsd b/variants/ccx-x86_64/libbsd
@@ -1,39 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+m4.9884105ada49333b0deef12f7fe3fef237616eb1f4de54543842fa6e66751a42
-#+libmd.318174462ee64053f953cf6a529fb93d64e49cd05f43ba78f46b2bb9d41454f3
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+m4.d59e91d2b05cad279f2386e2c5c6f7379312c9bbeb3a1736669dd68e973e0d20
+#+libmd.e900632bc819a29d1160ef5db15af94fba10b489847bc8bc50cb259531ea5ae3
 #@untar:-J:sha256:55fdfa2696fb4d55a592fa9ad14a9df897c7b0008ddb3b30c419914841f85f33:.
 
 
diff --git a/variants/ccx-x86_64/libcap b/variants/ccx-x86_64/libcap
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+pkgconf-pkg-config.5b602480e706af645071762d9b1551932f277d981f9a628d3528fd303fe5b0bb
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+pkgconf-pkg-config.7a3098acfd74332fd15ada57749e6427388f516defc07c6475c22c6babd34fdb
 #@untar:-J:sha256:f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb:.
 
 
diff --git a/variants/ccx-x86_64/libcgroup b/variants/ccx-x86_64/libcgroup
@@ -1,41 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+m4.9884105ada49333b0deef12f7fe3fef237616eb1f4de54543842fa6e66751a42
-#+flex.5394cba91edc6b9f5157ff4b94b03b76ed9de8768386d78d1d220acf2f37a13c
-#+bison.636e501a9f34a4a9bbd330542c82ab1c3c976aa060962e07c3f9bae008b3a4be
-#+musl-fts.1ad2576182a97936239bd2858f9ca7ac0039de62e14e09df76e7d81c129f57e6
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+m4.d59e91d2b05cad279f2386e2c5c6f7379312c9bbeb3a1736669dd68e973e0d20
+#+flex.85b7562cb29181ca685ee6e9e4b925ee9eb499989a6b65fac8ae9a07880302c9
+#+bison.4f02e10e21e40e2a298c016d258e52074009b196cb656bfb69a391e67e241381
+#+musl-fts.084e7d2498f016b764ae31b841c2630d783ce511d3345c0a874f62c32fba4838
 #@untar:-z:sha256:8d284d896fca1c981b55850e92acd3ad9648a69227c028dda7ae3402af878edd:.
 
 
diff --git a/variants/ccx-x86_64/libelf b/variants/ccx-x86_64/libelf
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+zstd.ba081e138e6ae4445d23365c271ad71a3dd85ec47d1de90c053b4c4863b01d2a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+zstd.fd3557864d85f019682e733bbdfa57a9aecb76b399f7136be5db7e75ba3180c7
 #@git:288355d104ff9930520c0283fe82556c6cc5c16f:libelf
 
 
diff --git a/variants/ccx-x86_64/libmd b/variants/ccx-x86_64/libmd
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+m4.9884105ada49333b0deef12f7fe3fef237616eb1f4de54543842fa6e66751a42
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+m4.d59e91d2b05cad279f2386e2c5c6f7379312c9bbeb3a1736669dd68e973e0d20
 #@untar:-J:sha256:1bd6aa42275313af3141c7cf2e5b964e8b1fd488025caf2f971f43b00776b332:.
 
 
diff --git a/variants/ccx-x86_64/libressl b/variants/ccx-x86_64/libressl
@@ -1,39 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+m4.9884105ada49333b0deef12f7fe3fef237616eb1f4de54543842fa6e66751a42
-#+ca-certificates-wip-donotuse.100800132d3f30f7502c8bb95dbc1a93cfc367b011a8b15ae3ac601558f60f85
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+m4.d59e91d2b05cad279f2386e2c5c6f7379312c9bbeb3a1736669dd68e973e0d20
+#+ca-certificates-wip-donotuse.074a095a5c98ee4499793f29d7ac8a107491393491446f44ef973cba7cf11b4c
 #@sha256:a68fedc0edd976b9f35ecfdcb252d80dc12084b1bc4e945be7dc42c437d8b540:c_rehash.c
 #@untar:-z:sha256:6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954:.
 
@@ -101,7 +99,7 @@ make DESTDIR="$pthbs_destdir" install
 
 cd ..
 gcc ./c_rehash.c -o c_rehash --static -static -I"$pthbs_destdir/$prefix/include" -L"$pthbs_destdir/$prefix/library" -lssl -lcrypto
-cp -vs '/home/ccx/versions/ca-certificates-wip-donotuse.100800132d3f30f7502c8bb95dbc1a93cfc367b011a8b15ae3ac601558f60f85/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/"
+cp -vs '/home/ccx/versions/ca-certificates-wip-donotuse.074a095a5c98ee4499793f29d7ac8a107491393491446f44ef973cba7cf11b4c/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/"
 ./c_rehash  "$pthbs_destdir/$prefix/config/ssl/certs/"
 cd  "$pthbs_destdir/$prefix/config/ssl/"
 mv cert.pem libressl-cert.pem
diff --git a/variants/ccx-x86_64/libseccomp b/variants/ccx-x86_64/libseccomp
@@ -1,40 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+m4.9884105ada49333b0deef12f7fe3fef237616eb1f4de54543842fa6e66751a42
-#+pkgconf-pkg-config.5b602480e706af645071762d9b1551932f277d981f9a628d3528fd303fe5b0bb
-#+gperf.28dc0f0052c4c6925e0d3671618fbfbe930a237b4786eb2e85ab923b922cd3ca
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+m4.d59e91d2b05cad279f2386e2c5c6f7379312c9bbeb3a1736669dd68e973e0d20
+#+pkgconf-pkg-config.7a3098acfd74332fd15ada57749e6427388f516defc07c6475c22c6babd34fdb
+#+gperf.8cc58476419e75f22d417d1d8644559bb56b607f3b34832fbc32d380b9a1f16d
 #@untar:-z:sha256:83b6085232d1588c379dc9b9cae47bb37407cf262e6e74993c61ba72d2a784dc:.
 
 
diff --git a/variants/ccx-x86_64/libunwind b/variants/ccx-x86_64/libunwind
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+m4.9884105ada49333b0deef12f7fe3fef237616eb1f4de54543842fa6e66751a42
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+m4.d59e91d2b05cad279f2386e2c5c6f7379312c9bbeb3a1736669dd68e973e0d20
 #@untar:-z:sha256:ddf0e32dd5fafe5283198d37e4bf9decf7ba1770b6e7e006c33e6df79e6a6157:.
 
 
diff --git a/variants/ccx-x86_64/linux b/variants/ccx-x86_64/linux
@@ -1,46 +1,44 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nofail_digest
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-modutils.f282fa77a1e46e5972915c2a4db14f6f046dc3e6878a555a85d035f1d3ad7f3a
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+findutils.9c194f156f0d27d3da7a8be576b0ea570bfae300591a1260bbb4e281d1ec1410
-#+diffutils.da2b4486fef6f10f6be614fc3bac358ac546f7d76ffc005e4a08b4f8a5e46580
-#+patch.7cee5060701fe40e46976123b129248ae396e91511c0c4344e76ebb8a10d498e
-#+flex.5394cba91edc6b9f5157ff4b94b03b76ed9de8768386d78d1d220acf2f37a13c
-#+bison.636e501a9f34a4a9bbd330542c82ab1c3c976aa060962e07c3f9bae008b3a4be
-#+rsync.4540ed2cf7259ea2a1baa33b66bb2f7756db99aa36bfec9fb276f0939be24d6a
-#+zstd.ba081e138e6ae4445d23365c271ad71a3dd85ec47d1de90c053b4c4863b01d2a
-#+libelf.4e9e115413a71fa8251ce827f31255ed48eed6e0a2b420c0299a499e7cc7cf33
-#+pkgconf-pkg-config.5b602480e706af645071762d9b1551932f277d981f9a628d3528fd303fe5b0bb
-#+nawk.764be91418272983788a47036400b02fd0853b73c0d25e1f87c5f4d8474f2193
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-modutils.92a768fa28dbba15fc5713588379fab0ed5ca949409f362e507f5de1bbf9b1b2
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+findutils.784f4cae35b89b0a109b58c374a370d40a86b7fc91549afea7b82031164224f7
+#+diffutils.5c134d14423ce2d3d0b682f78278ce79c8144de6ff2464b4aec16a03324c9bdb
+#+patch.c171fc1f5a838cffcbf2f7960012733c75560bed300b010582b0bc4029688d11
+#+flex.85b7562cb29181ca685ee6e9e4b925ee9eb499989a6b65fac8ae9a07880302c9
+#+bison.4f02e10e21e40e2a298c016d258e52074009b196cb656bfb69a391e67e241381
+#+rsync.f2bcc5a1d759b64ab0c241a3b13c8ba78b73bc2a7180270c15f4f793a086c1a5
+#+zstd.fd3557864d85f019682e733bbdfa57a9aecb76b399f7136be5db7e75ba3180c7
+#+libelf.ea18a9f6d10eaa99c978feea6d7489752eedd4d01082112f69c029b3b5d0e6ba
+#+pkgconf-pkg-config.7a3098acfd74332fd15ada57749e6427388f516defc07c6475c22c6babd34fdb
+#+nawk.346b8032668ae11dc1b3c55e656fb59bd37bf644a3b7a7d4e8cacc67cd1f7d3c
 #@untar:-J:sha256:2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb:.
 #@sha256:d9b01e4dac3dd140c394227603c8b3339bb2f1e10c97afd3607d84e3003ec75a:patch-6.1.34.xz
 #@sha256:cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867:linux.config
diff --git a/variants/ccx-x86_64/linux-qemu-guest b/variants/ccx-x86_64/linux-qemu-guest
@@ -1,46 +1,44 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nofail_digest
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-modutils.f282fa77a1e46e5972915c2a4db14f6f046dc3e6878a555a85d035f1d3ad7f3a
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+findutils.9c194f156f0d27d3da7a8be576b0ea570bfae300591a1260bbb4e281d1ec1410
-#+diffutils.da2b4486fef6f10f6be614fc3bac358ac546f7d76ffc005e4a08b4f8a5e46580
-#+patch.7cee5060701fe40e46976123b129248ae396e91511c0c4344e76ebb8a10d498e
-#+flex.5394cba91edc6b9f5157ff4b94b03b76ed9de8768386d78d1d220acf2f37a13c
-#+bison.636e501a9f34a4a9bbd330542c82ab1c3c976aa060962e07c3f9bae008b3a4be
-#+rsync.4540ed2cf7259ea2a1baa33b66bb2f7756db99aa36bfec9fb276f0939be24d6a
-#+zstd.ba081e138e6ae4445d23365c271ad71a3dd85ec47d1de90c053b4c4863b01d2a
-#+libelf.4e9e115413a71fa8251ce827f31255ed48eed6e0a2b420c0299a499e7cc7cf33
-#+pkgconf-pkg-config.5b602480e706af645071762d9b1551932f277d981f9a628d3528fd303fe5b0bb
-#+nawk.764be91418272983788a47036400b02fd0853b73c0d25e1f87c5f4d8474f2193
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-modutils.92a768fa28dbba15fc5713588379fab0ed5ca949409f362e507f5de1bbf9b1b2
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+findutils.784f4cae35b89b0a109b58c374a370d40a86b7fc91549afea7b82031164224f7
+#+diffutils.5c134d14423ce2d3d0b682f78278ce79c8144de6ff2464b4aec16a03324c9bdb
+#+patch.c171fc1f5a838cffcbf2f7960012733c75560bed300b010582b0bc4029688d11
+#+flex.85b7562cb29181ca685ee6e9e4b925ee9eb499989a6b65fac8ae9a07880302c9
+#+bison.4f02e10e21e40e2a298c016d258e52074009b196cb656bfb69a391e67e241381
+#+rsync.f2bcc5a1d759b64ab0c241a3b13c8ba78b73bc2a7180270c15f4f793a086c1a5
+#+zstd.fd3557864d85f019682e733bbdfa57a9aecb76b399f7136be5db7e75ba3180c7
+#+libelf.ea18a9f6d10eaa99c978feea6d7489752eedd4d01082112f69c029b3b5d0e6ba
+#+pkgconf-pkg-config.7a3098acfd74332fd15ada57749e6427388f516defc07c6475c22c6babd34fdb
+#+nawk.346b8032668ae11dc1b3c55e656fb59bd37bf644a3b7a7d4e8cacc67cd1f7d3c
 #@untar:-J:sha256:7586962547803be7ecc4056efc927fb25214548722bd28171172f3599abb9764:.
 #@sha256:cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867:linux.config
 #@sha256:ff3ddd131d73fee6838b11a6c4773bdb85c5f60fdd4b9ac4120ced021c341417:noobjtool.patch
diff --git a/variants/ccx-x86_64/logincaps b/variants/ccx-x86_64/logincaps
@@ -1,39 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+zsh.a875624a8c2f5f6c6604d187871191282ec0e508a04e02e50da940feb57a5e55
-#+pthbs-banginstall.7f65c9c54e1db4b91d35f49dccb3183fc217c97a8617623a56b58c810608fd01
-#+execline.ef45cef283c1f6e9c24e90b2ef0b66431057f5869041bb90c2e6ded169f6708d
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ccx-utils.21237b0f8b8c1dfd83b8740ea037c854eefd766d9880e6bdeae8ec2314dfadb6
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+zsh.7a1f16b02b56803d6ca36a1b1dc69ca475e25d7c7c7768a1112c65aefab218c7
+#+pthbs-banginstall.6ad862dde53fc43fdf0a40361245db79b9eac3132f2508bdfa634801dccfd145
+#+execline.475e8a451084e740445e652be569304b5253cb7ea54f346d356f11f5e1ea03f9
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+ccx-utils.006c7ef351618261d80134c5d57ebad1638f9d88751519e285f453cf5989321c
 #@git:409db79b3e7e5fc6b73305471d9bbb6ac5c14036:logincaps
 
 
diff --git a/variants/ccx-x86_64/m4 b/variants/ccx-x86_64/m4
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
 #@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:.
 
 
diff --git a/variants/ccx-x86_64/mandoc b/variants/ccx-x86_64/mandoc
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
 #@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.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+zsh.a875624a8c2f5f6c6604d187871191282ec0e508a04e02e50da940feb57a5e55
-#+pthbs-banginstall.7f65c9c54e1db4b91d35f49dccb3183fc217c97a8617623a56b58c810608fd01
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+zsh.7a1f16b02b56803d6ca36a1b1dc69ca475e25d7c7c7768a1112c65aefab218c7
+#+pthbs-banginstall.6ad862dde53fc43fdf0a40361245db79b9eac3132f2508bdfa634801dccfd145
 #@git:395634340de8349996fd273b055ae4bac9d2897c:mdev-scripts
 
 
diff --git a/variants/ccx-x86_64/mdevd b/variants/ccx-x86_64/mdevd
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+skalibs.12b87c93b239db5c4b37cecae9e5cf32f3231d65c42da4cf22fb99ff7fba4137
-#+execline.ef45cef283c1f6e9c24e90b2ef0b66431057f5869041bb90c2e6ded169f6708d
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+skalibs.f29096c5595e6633734737f4152fa758742e31cea13fc7c417ead0cb84bab142
+#+execline.475e8a451084e740445e652be569304b5253cb7ea54f346d356f11f5e1ea03f9
 #@git:96aef400b9f9d14f3bf54b0e444e9ad3665c4107:mdevd
 
 
@@ -49,7 +47,7 @@ cd 'mdevd'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.12b87c93b239db5c4b37cecae9e5cf32f3231d65c42da4cf22fb99ff7fba4137/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.f29096c5595e6633734737f4152fa758742e31cea13fc7c417ead0cb84bab142/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.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-dosfstools.dd4473fcd36714d5c7f48b24c741e9ff25cab8191b8a938120e6555358abaf36
-#+busybox-e2fsprogs.af22f5bfb127967d2c7cb085c11adf98c57952c67846eb568e3ee70bc0800ff4
-#+busybox-iproute2.429a54bf32fac8265b9ca927bae4b7de3af3c5fd9f061a2fa09ac6ba4cfb0547
-#+busybox-iputils.a132882568c16da450b40217627056d9ab070c4a970f27abb67956399e9bb896
-#+busybox-net-misc.e18fe87c787fea5b381f41bb4c5954045853eb5bd036da9ba7d675f5e1667d25
-#+busybox-net-tools.d32bd10ba3881ec71014104edfb977f42e6cfa60dddd407a4b6a81960843bf91
-#+busybox-traceroute.9410980bf85a580538648c725dff21fa68ab62a6ee0f499a1f53b2944fc81356
-#+busybox-wget.82b2601c8a223795dca073c9ebd794bd0a3a4c6d56daef0703f1e19a85b0fe4d
-#+busybox-chpst.22a5d86c0153999d56e756e2e300f10926171c73561cc434f676564ef615bd19
-#+busybox-console.c888a0d94712bbb705b47a277932b730c5302692d11c5dac15a2c8349807d750
-#+busybox-getty.5eed966a1ab5735ab0e1220c7c38e0dc961314edc9629164a58cc77db59ddea1
-#+busybox-i2c-tools.fe087d9620ca5d880fb6cfad84a4ed3ffff59aeffa8aa9d125653fd88b71879c
-#+busybox-linux-extra.10eb4aee15f17e8760b4685f4723cf489123d4d07bae35ce02be5549b905e721
-#+busybox-mtd-utils.201ace78153d39f20186375eef6f2b124307577b94dd7b37e98fb268d8a28f10
-#+busybox-shadow.54ec8e7c4864053589e7fced125ddb03c45c689e1fb1bd4c142e0df47cd963ef
-#+busybox-su.79d4e9637cc186124e8d1a5b72a77ab5f2232dcab7b29b5c797606f424ccfb80
-#+busybox-util-linux-priv.b323daa42a69e3ed4caed2626972642973591c3b6bd5cb9963c249476e4e032e
-#+busybox-logging.a007ecfbd910e6146552d52a06facbd893f7174e6bfe08c395998952f5858542
-#+busybox-cron.c31902ab827a3f2591cac4667ff928e8aa27cca83fec9c883c91778c226d1364
-#+execline.ef45cef283c1f6e9c24e90b2ef0b66431057f5869041bb90c2e6ded169f6708d
-#+s6.1065793dcf64a795110171081093831bf37a7515cd303333cf5f79acbc142442
-#+mdev-scripts.a1330a10f66b7abf23da32470d0462d3d66692e319b2b76fce0b9fb0cb7fa4a0
-#+mdevd.3dc2ef3401ec6cec248695d657775fe278fcc95dd0ff225e537e42faab22783d
-#+busybox.cfdaf18fc9502934f45ead4ec69633a8e91ab94b210de5f95e96ae66bc58f2e4-
\ No newline at end of file
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-dosfstools.c9bcaf4a1c2a95450d2fb53581257bf27bcb4c84824c6387e0908c257a932606
+#+busybox-e2fsprogs.54bb7d820303164a42bb414da0ef6749ec1e45d18d06a4b1694e01c38d3447a2
+#+busybox-iproute2.e1c6f823cc7247a2b8345054ca275d4706c4ec4c38d4c359a6b70c0a9f87cab8
+#+busybox-iputils.eb83990d46a3e9089442c7c3ff21539c64bc14d72d02aa48f60e665fa96fe216
+#+busybox-net-misc.791629de33700b1680c0c30e447ac11ca32ede8598b778810aac996e2bef3745
+#+busybox-net-tools.bdd60aee6a8ebaf6e3ed92caba9392d1edce09d5932eeb821fe73f8c2fb7d6ec
+#+busybox-traceroute.9b80dcf8781a63ca32be4152f8e9d0d893e65f52406fdf86e043f432c62b0d9e
+#+busybox-wget.7d365291da2f48646b1d18b9540cc7db9affe94fe849cb0e7daad3edbf7adf63
+#+busybox-chpst.09e7e45709fe060f689cd5eac9ce991fcf698b5b52acf02a65d4e6a43df29ece
+#+busybox-console.70083328c37eb6d45a5c310bf82e2241db91bb0c3f92266098887f4057552815
+#+busybox-getty.7e72fd0b61d1b84e58398e3e3bc3361a2192186722f8f4198fffc7e15003ff66
+#+busybox-i2c-tools.7a62f5b7ece736a528b4d5c39e6904d4b402e6da18a76a4a7b810a4ef1fc278a
+#+busybox-linux-extra.e4b51d3b44f20986326fd139c01649adfeeeeabe9c5d1570ba0226bfd308c416
+#+busybox-mtd-utils.14405293cae08da608e53ddc588c548f06899fcad2909ae684cc78f182af2bb1
+#+busybox-shadow.2ed3fcd69aeac846360ff923e5c4b4102570666f4df3e37244ab0e1ae027a75a
+#+busybox-su.d4fd0607e561de1ce676ba4ba1cc8a30491f92c5f59f48fd964b79a0831793b2
+#+busybox-util-linux-priv.411e3711b3bf8bff170b53dd5b5a75b926bc7d8be4cbff50c8edfe52a290772d
+#+busybox-logging.358c37382f44a62fc90c614f2ab489f6d3d0f20ab08e5837c65da54f1ac9c4de
+#+busybox-cron.db4dc6cdd1b0f7ae42abac61a297afd2d3a917e3a44216a8ae889d4282df9ee2
+#+execline.475e8a451084e740445e652be569304b5253cb7ea54f346d356f11f5e1ea03f9
+#+s6.01596fe30512c19492c69acff5d240a57c7bb941df5926c9af1d108109a899ff
+#+mdev-scripts.b868192426350951414751a1540b3a3dd5d23b2e75313ef5b89f3a1e3b8ac2f1
+#+mdevd.4478a4f21e9273ab12be5c1ca7559cebd3742ea316266163e3a770a4c5044f62
+#+busybox.3c90b59fa1a12cd017d08d46cf2979d51c33a17d018f204f88d0e640192e7e31+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/mlog b/variants/ccx-x86_64/mlog
@@ -1,36 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
 #@git:fefc95731f1260810a3551226b73d35f3d6e9d9e:mlog
 
 
diff --git a/variants/ccx-x86_64/musl-fts b/variants/ccx-x86_64/musl-fts
@@ -1,36 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
 #@untar:-z:sha256:49ae567a96dbab22823d045ffebe0d6b14b9b799925e9ca9274d47d26ff482a6:.
 
 
diff --git a/variants/ccx-x86_64/nawk b/variants/ccx-x86_64/nawk
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+bison.636e501a9f34a4a9bbd330542c82ab1c3c976aa060962e07c3f9bae008b3a4be
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+bison.4f02e10e21e40e2a298c016d258e52074009b196cb656bfb69a391e67e241381
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
 #@untar:-z:sha256:e031b1e1d2b230f276f975bffb923f0ea15f798c839d15a3f26a1a39448e32d7:.
 
 
diff --git a/variants/ccx-x86_64/netbsd-curses b/variants/ccx-x86_64/netbsd-curses
@@ -1,36 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
 #@git:51d179dad861640caeb76674b5908ccd79f04fae:netbsd-curses
 
 
diff --git a/variants/ccx-x86_64/nvi b/variants/ccx-x86_64/nvi
@@ -1,39 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+m4.9884105ada49333b0deef12f7fe3fef237616eb1f4de54543842fa6e66751a42
-#+netbsd-curses.39ba72dd4e237c6f440a1bd3056a734e0e792e09ef3f7e5e96514b4396241eb5
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+m4.d59e91d2b05cad279f2386e2c5c6f7379312c9bbeb3a1736669dd68e973e0d20
+#+netbsd-curses.c0cfcb49a978c41f512af2d7b65777aef30b3f80debc259077ffd13415dfcbcf
 #@untar:-z:sha256:755b87aa1e25c24c4c1668de5573d7d9a327b529423ce3ad9ee753bfb2296e33:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-astring b/variants/ccx-x86_64/ocaml-astring
@@ -1,41 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.3b6c29bf3530515699f6d9591d53733d80e7e8d04469000a167c9cf54cf1f9ca
-#+ocaml-findlib.7eb4466758ef6c3edb60457d6abd9872c08a258bb05ea0ef06f6ca9f933cd275
-#+ocamlbuild.dc013ab9fb7a4ad20e9c90dae31c443c580a3d020fcd0bcb46ccee4672828137
-#+opam.f781ab62060f6f6bf86aa2d3c3a34a352431ad50fa55e4ea8c24742b4296b82a
-#+ocaml-topkg.b5ed9ad3359c15a715a91591eb20f409e95684906de3f59747d0f31abd31badf
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+ocaml.f748973d16fcd129b5224672b1672d13d485218484b44b2259349ceecc47bcf0
+#+ocaml-findlib.912df054af38d55e9f6ffdc86aa1653bd42e6d0f7fb36b0f8f86b92535d4971e
+#+ocamlbuild.6f70ed9db4bfd04e068db46092290c5b455197fd3b46351e618857f71747df95
+#+opam.1d0040ab4457d16c95438d2f09d3ac6632ce79d702ab165e1175103b1d927a2d
+#+ocaml-topkg.6b33966f86b7ed2106247c343eb641a2cee9f317fce6437d0b6e82ab6b9c8bf8
 #@untar:-j:sha256:865692630c07c3ab87c66cdfc2734c0fdfc9c34a57f8e89ffec7c7d15e7a70fa:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-base b/variants/ccx-x86_64/ocaml-base
@@ -1,40 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.3b6c29bf3530515699f6d9591d53733d80e7e8d04469000a167c9cf54cf1f9ca
-#+dune.439adda48c6f13cb275c98a331018f432760ffa96ce59efd831e03ff0b2cf138
-#+ocaml_intrinsics_kernel.c9b60917411f66a8bf6223a697a4402ec199b8a645a9a09e548962c79e650207
-#+ocaml-sexplib0.47a8db78fdba1e9223f89e4db1cd3b8f22b72083a2a10e51e068ea2fdb27e1b7
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+ocaml.f748973d16fcd129b5224672b1672d13d485218484b44b2259349ceecc47bcf0
+#+dune.72b64ed54fe73265bfee3c2961fb946e4f8525112d47cd26c334967850f43993
+#+ocaml_intrinsics_kernel.a0e498a70b918c4bb2091315f974f978788a215bcac110d72dd18e6af08205c4
+#+ocaml-sexplib0.df4e3e3500e5f9cad063e10741712ee4e73a9639a10fa1471cb21938f597033a
 #@untar:-z:sha256:3f3f64789ab25bb5cb7f5f907dd651dec9cc9440981822fe75df6b94344b7208:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-bos b/variants/ccx-x86_64/ocaml-bos
@@ -1,47 +1,45 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.3b6c29bf3530515699f6d9591d53733d80e7e8d04469000a167c9cf54cf1f9ca
-#+ocaml-findlib.7eb4466758ef6c3edb60457d6abd9872c08a258bb05ea0ef06f6ca9f933cd275
-#+ocamlbuild.dc013ab9fb7a4ad20e9c90dae31c443c580a3d020fcd0bcb46ccee4672828137
-#+opam.f781ab62060f6f6bf86aa2d3c3a34a352431ad50fa55e4ea8c24742b4296b82a
-#+ocaml-topkg.b5ed9ad3359c15a715a91591eb20f409e95684906de3f59747d0f31abd31badf
-#+ocaml-astring.51960572d76fd2410667c52fa6d6dcd11660a82c5ab69a5d48a4c4db0df646ab
-#+ocaml-fpath.6768b8bd769ced89224256d439ca63a87c58daa7094f29068ebe2f24dbfd3b4b
-#+ocaml-rresult.2b05cb60fc857e4d8c0b45d5d3ecbd6a23887fb03c287a570eb7daca789ab7ac
-#+ocaml-fmt.813748716b43ac1d7553d891cdc5d1d8f42e575799036c4073ef66dbc65cd649
-#+ocaml-logs.b856ec4d9aad0bbe7fcf794f84adb42e68b45358a0a622ef3b4acfdb872abcdf
-#+ocaml-mtime.1afcc5d175dfd9cbdce43f31afd4753ae84b4af5affd49cc8c6667177fe4f7b2
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+ocaml.f748973d16fcd129b5224672b1672d13d485218484b44b2259349ceecc47bcf0
+#+ocaml-findlib.912df054af38d55e9f6ffdc86aa1653bd42e6d0f7fb36b0f8f86b92535d4971e
+#+ocamlbuild.6f70ed9db4bfd04e068db46092290c5b455197fd3b46351e618857f71747df95
+#+opam.1d0040ab4457d16c95438d2f09d3ac6632ce79d702ab165e1175103b1d927a2d
+#+ocaml-topkg.6b33966f86b7ed2106247c343eb641a2cee9f317fce6437d0b6e82ab6b9c8bf8
+#+ocaml-astring.26f52559fdc001c498df0184ab986c3b50d1e438ad90b1b918f081d25826d809
+#+ocaml-fpath.e35d2753f2673f97d11ad57a69adfcb239b4666c5fae4067868b9c52c0959c75
+#+ocaml-rresult.c035a4e485f8c5464fd9d6182e17b053801691c41206d8e4cf6a2b570dd660ce
+#+ocaml-fmt.2d430513db124c39a881fa013b2bf88969dfa7de342c61ce6228344689be2175
+#+ocaml-logs.f4b829d89df498777c584871fbca5af928cf7ec24c7fcfa79cfe67a885eac910
+#+ocaml-mtime.84c298e330cec9b3ae85a12bce4136fcf16a1992c7c2de855ba3b6957895a6d8
 #@untar:-j:sha256:d8d62e786b10d697e0457205a8eedeaa27ebcc90f1855f18df190cac2e3d8f37:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-cmdliner b/variants/ccx-x86_64/ocaml-cmdliner
@@ -1,41 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.3b6c29bf3530515699f6d9591d53733d80e7e8d04469000a167c9cf54cf1f9ca
-#+ocaml-findlib.7eb4466758ef6c3edb60457d6abd9872c08a258bb05ea0ef06f6ca9f933cd275
-#+ocamlbuild.dc013ab9fb7a4ad20e9c90dae31c443c580a3d020fcd0bcb46ccee4672828137
-#+opam.f781ab62060f6f6bf86aa2d3c3a34a352431ad50fa55e4ea8c24742b4296b82a
-#+ocaml-topkg.b5ed9ad3359c15a715a91591eb20f409e95684906de3f59747d0f31abd31badf
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+ocaml.f748973d16fcd129b5224672b1672d13d485218484b44b2259349ceecc47bcf0
+#+ocaml-findlib.912df054af38d55e9f6ffdc86aa1653bd42e6d0f7fb36b0f8f86b92535d4971e
+#+ocamlbuild.6f70ed9db4bfd04e068db46092290c5b455197fd3b46351e618857f71747df95
+#+opam.1d0040ab4457d16c95438d2f09d3ac6632ce79d702ab165e1175103b1d927a2d
+#+ocaml-topkg.6b33966f86b7ed2106247c343eb641a2cee9f317fce6437d0b6e82ab6b9c8bf8
 #@untar:-j:sha256:4e547a631c36fbaadff60d3bd7724eb3f83ba274e92fb725950bae7868378582:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-compiler-libs b/variants/ccx-x86_64/ocaml-compiler-libs
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.3b6c29bf3530515699f6d9591d53733d80e7e8d04469000a167c9cf54cf1f9ca
-#+dune.439adda48c6f13cb275c98a331018f432760ffa96ce59efd831e03ff0b2cf138
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+ocaml.f748973d16fcd129b5224672b1672d13d485218484b44b2259349ceecc47bcf0
+#+dune.72b64ed54fe73265bfee3c2961fb946e4f8525112d47cd26c334967850f43993
 #@untar:-z:sha256:9b9644d7351db699e57ddba7c767bb4153e6e988ccf45ead2fb238a3bd75cdc7:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-cppo b/variants/ccx-x86_64/ocaml-cppo
@@ -1,39 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.3b6c29bf3530515699f6d9591d53733d80e7e8d04469000a167c9cf54cf1f9ca
-#+dune.439adda48c6f13cb275c98a331018f432760ffa96ce59efd831e03ff0b2cf138
-#+ocamlbuild.dc013ab9fb7a4ad20e9c90dae31c443c580a3d020fcd0bcb46ccee4672828137
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+ocaml.f748973d16fcd129b5224672b1672d13d485218484b44b2259349ceecc47bcf0
+#+dune.72b64ed54fe73265bfee3c2961fb946e4f8525112d47cd26c334967850f43993
+#+ocamlbuild.6f70ed9db4bfd04e068db46092290c5b455197fd3b46351e618857f71747df95
 #@untar:-z:sha256:6e62a8ee0217c9cc38d5860110eb18eb8d89c05c420353d298e1431fe8bac00f:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-findlib b/variants/ccx-x86_64/ocaml-findlib
@@ -1,41 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+m4.9884105ada49333b0deef12f7fe3fef237616eb1f4de54543842fa6e66751a42
-#+netbsd-curses.39ba72dd4e237c6f440a1bd3056a734e0e792e09ef3f7e5e96514b4396241eb5
-#+ocaml.3b6c29bf3530515699f6d9591d53733d80e7e8d04469000a167c9cf54cf1f9ca
-#+ocamlbuild.dc013ab9fb7a4ad20e9c90dae31c443c580a3d020fcd0bcb46ccee4672828137
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+m4.d59e91d2b05cad279f2386e2c5c6f7379312c9bbeb3a1736669dd68e973e0d20
+#+netbsd-curses.c0cfcb49a978c41f512af2d7b65777aef30b3f80debc259077ffd13415dfcbcf
+#+ocaml.f748973d16fcd129b5224672b1672d13d485218484b44b2259349ceecc47bcf0
+#+ocamlbuild.6f70ed9db4bfd04e068db46092290c5b455197fd3b46351e618857f71747df95
 #@untar:-z:sha256:662c910f774e9fee3a19c4e057f380581ab2fc4ee52da4761304ac9c31b8869d:.
 
 
@@ -81,7 +79,7 @@ cd 'findlib-1.9.8'
 make -j1 all opt
 
 # workaround `topfind` getting installed to stdlib directory, this is not configurable
-stdlib="$pthbs_destdir/home/ccx/versions/ocaml.3b6c29bf3530515699f6d9591d53733d80e7e8d04469000a167c9cf54cf1f9ca"
+stdlib="$pthbs_destdir/home/ccx/versions/ocaml.f748973d16fcd129b5224672b1672d13d485218484b44b2259349ceecc47bcf0"
 mkdir -p "${stdlib%/*}"
 ln -s "$pthbs_package" "$stdlib"
 make install prefix="$pthbs_destdir"
diff --git a/variants/ccx-x86_64/ocaml-fmt b/variants/ccx-x86_64/ocaml-fmt
@@ -1,42 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.3b6c29bf3530515699f6d9591d53733d80e7e8d04469000a167c9cf54cf1f9ca
-#+ocaml-findlib.7eb4466758ef6c3edb60457d6abd9872c08a258bb05ea0ef06f6ca9f933cd275
-#+ocamlbuild.dc013ab9fb7a4ad20e9c90dae31c443c580a3d020fcd0bcb46ccee4672828137
-#+opam.f781ab62060f6f6bf86aa2d3c3a34a352431ad50fa55e4ea8c24742b4296b82a
-#+ocaml-topkg.b5ed9ad3359c15a715a91591eb20f409e95684906de3f59747d0f31abd31badf
-#+ocaml-cmdliner.081973389e12b38b2d35540887597f3e2984db0e966d17f971e72dc8b5764188
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+ocaml.f748973d16fcd129b5224672b1672d13d485218484b44b2259349ceecc47bcf0
+#+ocaml-findlib.912df054af38d55e9f6ffdc86aa1653bd42e6d0f7fb36b0f8f86b92535d4971e
+#+ocamlbuild.6f70ed9db4bfd04e068db46092290c5b455197fd3b46351e618857f71747df95
+#+opam.1d0040ab4457d16c95438d2f09d3ac6632ce79d702ab165e1175103b1d927a2d
+#+ocaml-topkg.6b33966f86b7ed2106247c343eb641a2cee9f317fce6437d0b6e82ab6b9c8bf8
+#+ocaml-cmdliner.4490d8d1d9381abe9ae380bf6b899810cf03d913ac9f0f996c56b80c7ebf7c1e
 #@untar:-j:sha256:857cfd47a54b52429cd9b3e2665e44173cd1bd3b435bece7172f984ad5376a1b:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-fpath b/variants/ccx-x86_64/ocaml-fpath
@@ -1,42 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.3b6c29bf3530515699f6d9591d53733d80e7e8d04469000a167c9cf54cf1f9ca
-#+ocaml-findlib.7eb4466758ef6c3edb60457d6abd9872c08a258bb05ea0ef06f6ca9f933cd275
-#+ocamlbuild.dc013ab9fb7a4ad20e9c90dae31c443c580a3d020fcd0bcb46ccee4672828137
-#+opam.f781ab62060f6f6bf86aa2d3c3a34a352431ad50fa55e4ea8c24742b4296b82a
-#+ocaml-topkg.b5ed9ad3359c15a715a91591eb20f409e95684906de3f59747d0f31abd31badf
-#+ocaml-astring.51960572d76fd2410667c52fa6d6dcd11660a82c5ab69a5d48a4c4db0df646ab
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+ocaml.f748973d16fcd129b5224672b1672d13d485218484b44b2259349ceecc47bcf0
+#+ocaml-findlib.912df054af38d55e9f6ffdc86aa1653bd42e6d0f7fb36b0f8f86b92535d4971e
+#+ocamlbuild.6f70ed9db4bfd04e068db46092290c5b455197fd3b46351e618857f71747df95
+#+opam.1d0040ab4457d16c95438d2f09d3ac6632ce79d702ab165e1175103b1d927a2d
+#+ocaml-topkg.6b33966f86b7ed2106247c343eb641a2cee9f317fce6437d0b6e82ab6b9c8bf8
+#+ocaml-astring.26f52559fdc001c498df0184ab986c3b50d1e438ad90b1b918f081d25826d809
 #@untar:-j:sha256:12b08ff192d037d9b6d69e9ca19d1d385184f20b3237c27231e437ac81ace70f:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-logs b/variants/ccx-x86_64/ocaml-logs
@@ -1,44 +1,42 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.3b6c29bf3530515699f6d9591d53733d80e7e8d04469000a167c9cf54cf1f9ca
-#+ocaml-findlib.7eb4466758ef6c3edb60457d6abd9872c08a258bb05ea0ef06f6ca9f933cd275
-#+ocamlbuild.dc013ab9fb7a4ad20e9c90dae31c443c580a3d020fcd0bcb46ccee4672828137
-#+opam.f781ab62060f6f6bf86aa2d3c3a34a352431ad50fa55e4ea8c24742b4296b82a
-#+ocaml-topkg.b5ed9ad3359c15a715a91591eb20f409e95684906de3f59747d0f31abd31badf
-#+ocaml-mtime.1afcc5d175dfd9cbdce43f31afd4753ae84b4af5affd49cc8c6667177fe4f7b2
-#+ocaml-cmdliner.081973389e12b38b2d35540887597f3e2984db0e966d17f971e72dc8b5764188
-#+ocaml-fmt.813748716b43ac1d7553d891cdc5d1d8f42e575799036c4073ef66dbc65cd649
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+ocaml.f748973d16fcd129b5224672b1672d13d485218484b44b2259349ceecc47bcf0
+#+ocaml-findlib.912df054af38d55e9f6ffdc86aa1653bd42e6d0f7fb36b0f8f86b92535d4971e
+#+ocamlbuild.6f70ed9db4bfd04e068db46092290c5b455197fd3b46351e618857f71747df95
+#+opam.1d0040ab4457d16c95438d2f09d3ac6632ce79d702ab165e1175103b1d927a2d
+#+ocaml-topkg.6b33966f86b7ed2106247c343eb641a2cee9f317fce6437d0b6e82ab6b9c8bf8
+#+ocaml-mtime.84c298e330cec9b3ae85a12bce4136fcf16a1992c7c2de855ba3b6957895a6d8
+#+ocaml-cmdliner.4490d8d1d9381abe9ae380bf6b899810cf03d913ac9f0f996c56b80c7ebf7c1e
+#+ocaml-fmt.2d430513db124c39a881fa013b2bf88969dfa7de342c61ce6228344689be2175
 #@untar:-j:sha256:ee97065ba41ce28f19dea9453c6bec4e0ef26165ad7394c4131ea0c65c0f06d5:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-lun b/variants/ccx-x86_64/ocaml-lun
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.3b6c29bf3530515699f6d9591d53733d80e7e8d04469000a167c9cf54cf1f9ca
-#+dune.439adda48c6f13cb275c98a331018f432760ffa96ce59efd831e03ff0b2cf138
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+ocaml.f748973d16fcd129b5224672b1672d13d485218484b44b2259349ceecc47bcf0
+#+dune.72b64ed54fe73265bfee3c2961fb946e4f8525112d47cd26c334967850f43993
 #@untar:-j:sha256:cca8badff83b470fdcfb1840116f8e8a6f2cb86cde2f44ed28cf26cbf692a793:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-mtime b/variants/ccx-x86_64/ocaml-mtime
@@ -1,41 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.3b6c29bf3530515699f6d9591d53733d80e7e8d04469000a167c9cf54cf1f9ca
-#+ocaml-findlib.7eb4466758ef6c3edb60457d6abd9872c08a258bb05ea0ef06f6ca9f933cd275
-#+ocamlbuild.dc013ab9fb7a4ad20e9c90dae31c443c580a3d020fcd0bcb46ccee4672828137
-#+opam.f781ab62060f6f6bf86aa2d3c3a34a352431ad50fa55e4ea8c24742b4296b82a
-#+ocaml-topkg.b5ed9ad3359c15a715a91591eb20f409e95684906de3f59747d0f31abd31badf
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+ocaml.f748973d16fcd129b5224672b1672d13d485218484b44b2259349ceecc47bcf0
+#+ocaml-findlib.912df054af38d55e9f6ffdc86aa1653bd42e6d0f7fb36b0f8f86b92535d4971e
+#+ocamlbuild.6f70ed9db4bfd04e068db46092290c5b455197fd3b46351e618857f71747df95
+#+opam.1d0040ab4457d16c95438d2f09d3ac6632ce79d702ab165e1175103b1d927a2d
+#+ocaml-topkg.6b33966f86b7ed2106247c343eb641a2cee9f317fce6437d0b6e82ab6b9c8bf8
 #@untar:-j:sha256:097cb2802e3701ead9572e1b483d5a28c6e2f0a39449faaf9b44ad8a89834d88:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-ppx_derivers b/variants/ccx-x86_64/ocaml-ppx_derivers
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.3b6c29bf3530515699f6d9591d53733d80e7e8d04469000a167c9cf54cf1f9ca
-#+dune.439adda48c6f13cb275c98a331018f432760ffa96ce59efd831e03ff0b2cf138
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+ocaml.f748973d16fcd129b5224672b1672d13d485218484b44b2259349ceecc47bcf0
+#+dune.72b64ed54fe73265bfee3c2961fb946e4f8525112d47cd26c334967850f43993
 #@untar:-z:sha256:b6595ee187dea792b31fc54a0e1524ab1e48bc6068d3066c45215a138cc73b95:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-ppx_deriving b/variants/ccx-x86_64/ocaml-ppx_deriving
@@ -1,45 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.3b6c29bf3530515699f6d9591d53733d80e7e8d04469000a167c9cf54cf1f9ca
-#+dune.439adda48c6f13cb275c98a331018f432760ffa96ce59efd831e03ff0b2cf138
-#+ocaml-compiler-libs.5092324bf0be64fc72af6aa53977fa8b1c753599190ce6656d84800ec4dda00b
-#+ocaml-cppo.f029b04deead7f0b52e1bc084cfd66cb5caa34fddb7d1e3fb94bb806fa5b177b
-#+ocaml-findlib.7eb4466758ef6c3edb60457d6abd9872c08a258bb05ea0ef06f6ca9f933cd275
-#+ocaml-ppx_derivers.8e5758e1819f7ebc5238c4e3398b3a46f15b9fad09175e71c00360717993ecad
-#+ocaml-ppxlib.d6aaa6330d6c285e9b52e5314d87b70eedc80fc064ebc3f6e4bb12d7c5971c22
-#+ocaml-sexplib0.47a8db78fdba1e9223f89e4db1cd3b8f22b72083a2a10e51e068ea2fdb27e1b7
-#+ocaml-stdlib-shims.bb0717b6f587b8fecfe1995b2ed5648d8c993ce8aaf6f4693b37764af733c831
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+ocaml.f748973d16fcd129b5224672b1672d13d485218484b44b2259349ceecc47bcf0
+#+dune.72b64ed54fe73265bfee3c2961fb946e4f8525112d47cd26c334967850f43993
+#+ocaml-compiler-libs.bbaf69ae9e4ed69f2af9df2ee11bbda65bff3d00ea60c74e925db07c4edb0fb9
+#+ocaml-cppo.e59c333e4412e6fab5c83b2e2210873958285fbafd566f909903bed92d3e3d2c
+#+ocaml-findlib.912df054af38d55e9f6ffdc86aa1653bd42e6d0f7fb36b0f8f86b92535d4971e
+#+ocaml-ppx_derivers.fdc3647f0222caba6bf7e680894ae5a73840ab0fe2cba19b9ef7f2aeef320281
+#+ocaml-ppxlib.0c73e23f48ff1ee061607267a66db0b27857c1490efad6fa96e2a84a1afbe934
+#+ocaml-sexplib0.df4e3e3500e5f9cad063e10741712ee4e73a9639a10fa1471cb21938f597033a
+#+ocaml-stdlib-shims.6144e741e3f036bc55ad42810712fac25fda9172a759aac1bc9b4c39b621a69f
 #@untar:-z:sha256:c91d1ea5e15e6928a2f8947dbd135b9f765cc0e2d72be271427981afcd350c24:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-ppxlib b/variants/ccx-x86_64/ocaml-ppxlib
@@ -1,42 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.3b6c29bf3530515699f6d9591d53733d80e7e8d04469000a167c9cf54cf1f9ca
-#+dune.439adda48c6f13cb275c98a331018f432760ffa96ce59efd831e03ff0b2cf138
-#+ocaml-compiler-libs.5092324bf0be64fc72af6aa53977fa8b1c753599190ce6656d84800ec4dda00b
-#+ocaml-ppx_derivers.8e5758e1819f7ebc5238c4e3398b3a46f15b9fad09175e71c00360717993ecad
-#+ocaml-sexplib0.47a8db78fdba1e9223f89e4db1cd3b8f22b72083a2a10e51e068ea2fdb27e1b7
-#+ocaml-stdlib-shims.bb0717b6f587b8fecfe1995b2ed5648d8c993ce8aaf6f4693b37764af733c831
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+ocaml.f748973d16fcd129b5224672b1672d13d485218484b44b2259349ceecc47bcf0
+#+dune.72b64ed54fe73265bfee3c2961fb946e4f8525112d47cd26c334967850f43993
+#+ocaml-compiler-libs.bbaf69ae9e4ed69f2af9df2ee11bbda65bff3d00ea60c74e925db07c4edb0fb9
+#+ocaml-ppx_derivers.fdc3647f0222caba6bf7e680894ae5a73840ab0fe2cba19b9ef7f2aeef320281
+#+ocaml-sexplib0.df4e3e3500e5f9cad063e10741712ee4e73a9639a10fa1471cb21938f597033a
+#+ocaml-stdlib-shims.6144e741e3f036bc55ad42810712fac25fda9172a759aac1bc9b4c39b621a69f
 #@untar:-j:sha256:2e223837e7cecc3bc84a432432c0a72f4e1d5be9165c9c33772f156db85db0b3:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-rresult b/variants/ccx-x86_64/ocaml-rresult
@@ -1,41 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.3b6c29bf3530515699f6d9591d53733d80e7e8d04469000a167c9cf54cf1f9ca
-#+ocaml-findlib.7eb4466758ef6c3edb60457d6abd9872c08a258bb05ea0ef06f6ca9f933cd275
-#+ocamlbuild.dc013ab9fb7a4ad20e9c90dae31c443c580a3d020fcd0bcb46ccee4672828137
-#+opam.f781ab62060f6f6bf86aa2d3c3a34a352431ad50fa55e4ea8c24742b4296b82a
-#+ocaml-topkg.b5ed9ad3359c15a715a91591eb20f409e95684906de3f59747d0f31abd31badf
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+ocaml.f748973d16fcd129b5224672b1672d13d485218484b44b2259349ceecc47bcf0
+#+ocaml-findlib.912df054af38d55e9f6ffdc86aa1653bd42e6d0f7fb36b0f8f86b92535d4971e
+#+ocamlbuild.6f70ed9db4bfd04e068db46092290c5b455197fd3b46351e618857f71747df95
+#+opam.1d0040ab4457d16c95438d2f09d3ac6632ce79d702ab165e1175103b1d927a2d
+#+ocaml-topkg.6b33966f86b7ed2106247c343eb641a2cee9f317fce6437d0b6e82ab6b9c8bf8
 #@untar:-j:sha256:11aa7f5b83460e60431e3154e3e32c071d46e151ea5760cf24377805bf975540:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-sexplib0 b/variants/ccx-x86_64/ocaml-sexplib0
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.3b6c29bf3530515699f6d9591d53733d80e7e8d04469000a167c9cf54cf1f9ca
-#+dune.439adda48c6f13cb275c98a331018f432760ffa96ce59efd831e03ff0b2cf138
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+ocaml.f748973d16fcd129b5224672b1672d13d485218484b44b2259349ceecc47bcf0
+#+dune.72b64ed54fe73265bfee3c2961fb946e4f8525112d47cd26c334967850f43993
 #@untar:-z:sha256:86dba26468194512f789f2fb709063515a9cb4e5c4461c021c239a369590701d:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-stdlib-shims b/variants/ccx-x86_64/ocaml-stdlib-shims
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.3b6c29bf3530515699f6d9591d53733d80e7e8d04469000a167c9cf54cf1f9ca
-#+dune.439adda48c6f13cb275c98a331018f432760ffa96ce59efd831e03ff0b2cf138
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+ocaml.f748973d16fcd129b5224672b1672d13d485218484b44b2259349ceecc47bcf0
+#+dune.72b64ed54fe73265bfee3c2961fb946e4f8525112d47cd26c334967850f43993
 #@untar:-j:sha256:babf72d3917b86f707885f0c5528e36c63fccb698f4b46cf2bab5c7ccdd6d84a:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-topkg b/variants/ccx-x86_64/ocaml-topkg
@@ -1,40 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.3b6c29bf3530515699f6d9591d53733d80e7e8d04469000a167c9cf54cf1f9ca
-#+ocaml-findlib.7eb4466758ef6c3edb60457d6abd9872c08a258bb05ea0ef06f6ca9f933cd275
-#+ocamlbuild.dc013ab9fb7a4ad20e9c90dae31c443c580a3d020fcd0bcb46ccee4672828137
-#+opam.f781ab62060f6f6bf86aa2d3c3a34a352431ad50fa55e4ea8c24742b4296b82a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+ocaml.f748973d16fcd129b5224672b1672d13d485218484b44b2259349ceecc47bcf0
+#+ocaml-findlib.912df054af38d55e9f6ffdc86aa1653bd42e6d0f7fb36b0f8f86b92535d4971e
+#+ocamlbuild.6f70ed9db4bfd04e068db46092290c5b455197fd3b46351e618857f71747df95
+#+opam.1d0040ab4457d16c95438d2f09d3ac6632ce79d702ab165e1175103b1d927a2d
 #@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.3b6c29bf3530515699f6d9591d53733d80e7e8d04469000a167c9cf54cf1f9ca
-#+dune.439adda48c6f13cb275c98a331018f432760ffa96ce59efd831e03ff0b2cf138
-#+ocamlbuild.dc013ab9fb7a4ad20e9c90dae31c443c580a3d020fcd0bcb46ccee4672828137
-#+ocaml-base.3e79935a7ab5e20500d03b688d349b0b4af0082e9121e52d3a2051f7b5f824c7
-#+opam.f781ab62060f6f6bf86aa2d3c3a34a352431ad50fa55e4ea8c24742b4296b82a
-#+ocaml-bos.105768cb0ea7aa948f46f308fdd96585da5f0a252199e268c203314029b40d74
-#+ocaml-lun.519fd2a721e65daa8bc0fbcfc7dc7daf5aa5dd4226956a213e7de231cd0469b7
-#+ocaml-ppx_deriving.a7924de8cce01ce35ec0851147dcb2065e9de1249faea6dd72937a1fd51ff105-
\ No newline at end of file
+#+ocaml.f748973d16fcd129b5224672b1672d13d485218484b44b2259349ceecc47bcf0
+#+dune.72b64ed54fe73265bfee3c2961fb946e4f8525112d47cd26c334967850f43993
+#+ocamlbuild.6f70ed9db4bfd04e068db46092290c5b455197fd3b46351e618857f71747df95
+#+ocaml-base.59d76ebba5ca44264b115950a5adec4447ac8ed68db5f36b6faeea76ba00c009
+#+opam.1d0040ab4457d16c95438d2f09d3ac6632ce79d702ab165e1175103b1d927a2d
+#+ocaml-bos.5e2fbcc5870773c21c0c4d9ca4634c9d75d3a482181e93cb3180df2d2f5572e3
+#+ocaml-lun.696b14515ddd337619d1600678567dd37e39dd3f9ecbbf595dba8ea1fb1d2918
+#+ocaml-ppx_deriving.b75d5b7f785760403ab5a9b6c20064903231356a0e960370ef21a24a07dc1aba+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/ocaml:dynlink b/variants/ccx-x86_64/ocaml:dynlink
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+m4.9884105ada49333b0deef12f7fe3fef237616eb1f4de54543842fa6e66751a42
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+m4.d59e91d2b05cad279f2386e2c5c6f7379312c9bbeb3a1736669dd68e973e0d20
 #@untar:-J:sha256:dfaa8a2e11c799bc1765d8bef44911406ee5f4803027190382a939f88c912266:.
 
 
diff --git a/variants/ccx-x86_64/ocaml_intrinsics_kernel b/variants/ccx-x86_64/ocaml_intrinsics_kernel
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.3b6c29bf3530515699f6d9591d53733d80e7e8d04469000a167c9cf54cf1f9ca
-#+dune.439adda48c6f13cb275c98a331018f432760ffa96ce59efd831e03ff0b2cf138
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+ocaml.f748973d16fcd129b5224672b1672d13d485218484b44b2259349ceecc47bcf0
+#+dune.72b64ed54fe73265bfee3c2961fb946e4f8525112d47cd26c334967850f43993
 #@untar:-z:sha256:c988b7769a59749631c3c98ba5edd1d2fe91f5dc380b5e0593c073c92f4bee01:.
 
 
diff --git a/variants/ccx-x86_64/ocamlbuild b/variants/ccx-x86_64/ocamlbuild
@@ -1,39 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+m4.9884105ada49333b0deef12f7fe3fef237616eb1f4de54543842fa6e66751a42
-#+ocaml.3b6c29bf3530515699f6d9591d53733d80e7e8d04469000a167c9cf54cf1f9ca
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+m4.d59e91d2b05cad279f2386e2c5c6f7379312c9bbeb3a1736669dd68e973e0d20
+#+ocaml.f748973d16fcd129b5224672b1672d13d485218484b44b2259349ceecc47bcf0
 #@untar:-z:sha256:2ba6857f2991b7f69368e8db818b163d31cf5a367f15f5953bf8f01a77b3d4fc:.
 
 
@@ -77,7 +75,7 @@ make configure \
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
 # workaround ocamlbuild manpage getting installed to stdlib directory
-stdlib="$pthbs_destdir/home/ccx/versions/ocaml.3b6c29bf3530515699f6d9591d53733d80e7e8d04469000a167c9cf54cf1f9ca"
+stdlib="$pthbs_destdir/home/ccx/versions/ocaml.f748973d16fcd129b5224672b1672d13d485218484b44b2259349ceecc47bcf0"
 mkdir -p "${stdlib%/*}"
 ln -s "$pthbs_package" "$stdlib"
 
diff --git a/variants/ccx-x86_64/opam b/variants/ccx-x86_64/opam
@@ -1,41 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+diffutils.da2b4486fef6f10f6be614fc3bac358ac546f7d76ffc005e4a08b4f8a5e46580
-#+patch.7cee5060701fe40e46976123b129248ae396e91511c0c4344e76ebb8a10d498e
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+getconf.2cf874cd3fe88746245e2607e6d6decfcd4260156ad3546dd83cd2246602ad4f
-#+ocaml.3b6c29bf3530515699f6d9591d53733d80e7e8d04469000a167c9cf54cf1f9ca
-#+dune.439adda48c6f13cb275c98a331018f432760ffa96ce59efd831e03ff0b2cf138
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+diffutils.5c134d14423ce2d3d0b682f78278ce79c8144de6ff2464b4aec16a03324c9bdb
+#+patch.c171fc1f5a838cffcbf2f7960012733c75560bed300b010582b0bc4029688d11
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+getconf.b3f1ba0a15d4320332d567bb1e008682a255b7574312579b214452aa314fdbc7
+#+ocaml.f748973d16fcd129b5224672b1672d13d485218484b44b2259349ceecc47bcf0
+#+dune.72b64ed54fe73265bfee3c2961fb946e4f8525112d47cd26c334967850f43993
 #@untar:-z:sha256:c4d053029793c714e4e7340b1157428c0f90783585fb17f35158247a640467d9:.
 
 
@@ -74,7 +72,7 @@ export DUNE_CACHE=disabled
 	--infodir="$prefix/info" \
 	--localedir="$prefix/locale" \
 	--localstatedir='/var/pthbs' \
-	--with-dune='/home/ccx/versions/dune.439adda48c6f13cb275c98a331018f432760ffa96ce59efd831e03ff0b2cf138/command/dune' \
+	--with-dune='/home/ccx/versions/dune.72b64ed54fe73265bfee3c2961fb946e4f8525112d47cd26c334967850f43993/command/dune' \
 	--with-mccs \
 	--with-vendored-deps \
 	--enable-static
diff --git a/variants/ccx-x86_64/patch b/variants/ccx-x86_64/patch
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+m4.9884105ada49333b0deef12f7fe3fef237616eb1f4de54543842fa6e66751a42
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+m4.d59e91d2b05cad279f2386e2c5c6f7379312c9bbeb3a1736669dd68e973e0d20
 #@untar:-J:sha256:ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd:.
 
 
diff --git a/variants/ccx-x86_64/pkgconf b/variants/ccx-x86_64/pkgconf
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+m4.9884105ada49333b0deef12f7fe3fef237616eb1f4de54543842fa6e66751a42
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+m4.d59e91d2b05cad279f2386e2c5c6f7379312c9bbeb3a1736669dd68e973e0d20
 #@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.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+pkgconf.77c2d4a21df1f4492a8354388b4b0ec82bd5b8ce1cce68cf13e692461d84524d
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+pkgconf.9cf6373a2ce160b296de039c3fdf085371ccd20ee33c3d065b33cf7fea7b3a91
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/popt b/variants/ccx-x86_64/popt
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+m4.9884105ada49333b0deef12f7fe3fef237616eb1f4de54543842fa6e66751a42
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+m4.d59e91d2b05cad279f2386e2c5c6f7379312c9bbeb3a1736669dd68e973e0d20
 #@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.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+zsh.a875624a8c2f5f6c6604d187871191282ec0e508a04e02e50da940feb57a5e55
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+zsh.7a1f16b02b56803d6ca36a1b1dc69ca475e25d7c7c7768a1112c65aefab218c7
 #@sha256:1e021bddaf5c020ede9107656494715236a894557b99035365fc999605541b2d:pthbs-banginstall
 
 
diff --git a/variants/ccx-x86_64/rsync b/variants/ccx-x86_64/rsync
@@ -1,41 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+m4.9884105ada49333b0deef12f7fe3fef237616eb1f4de54543842fa6e66751a42
-#+nawk.764be91418272983788a47036400b02fd0853b73c0d25e1f87c5f4d8474f2193
-#+popt.b5806559c300ff994e8f958b777d5075109496e3096ba238c51013b00a36ccde
-#+libressl.3ee18387381a6e865f9cc9d7ef9b035d2700a552724d28c3807fd93ac01cd164
-#+zstd.ba081e138e6ae4445d23365c271ad71a3dd85ec47d1de90c053b4c4863b01d2a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+m4.d59e91d2b05cad279f2386e2c5c6f7379312c9bbeb3a1736669dd68e973e0d20
+#+nawk.346b8032668ae11dc1b3c55e656fb59bd37bf644a3b7a7d4e8cacc67cd1f7d3c
+#+popt.f4a40537a9bb5e979da4f989126d37180b75afa79d274637ffdef9da580d1875
+#+libressl.7b4860d5321ed95c9f8056ac6ca46f2726066c82339065d89aa65619f45b12f7
+#+zstd.fd3557864d85f019682e733bbdfa57a9aecb76b399f7136be5db7e75ba3180c7
 #@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:.
 
 
diff --git a/variants/ccx-x86_64/s6 b/variants/ccx-x86_64/s6
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+skalibs.12b87c93b239db5c4b37cecae9e5cf32f3231d65c42da4cf22fb99ff7fba4137
-#+execline.ef45cef283c1f6e9c24e90b2ef0b66431057f5869041bb90c2e6ded169f6708d
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+skalibs.f29096c5595e6633734737f4152fa758742e31cea13fc7c417ead0cb84bab142
+#+execline.475e8a451084e740445e652be569304b5253cb7ea54f346d356f11f5e1ea03f9
 #@git:0e02fe0e92b8f9a619fc355babad2c78c009c1f1:s6
 
 
@@ -49,7 +47,7 @@ cd 's6'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.12b87c93b239db5c4b37cecae9e5cf32f3231d65c42da4cf22fb99ff7fba4137/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.f29096c5595e6633734737f4152fa758742e31cea13fc7c417ead0cb84bab142/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/ccx-x86_64/s6-dns b/variants/ccx-x86_64/s6-dns
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+skalibs.12b87c93b239db5c4b37cecae9e5cf32f3231d65c42da4cf22fb99ff7fba4137
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+skalibs.f29096c5595e6633734737f4152fa758742e31cea13fc7c417ead0cb84bab142
 #@git:dc80225c0a78346300d100f0bf0182ed338c4b01:s6-dns
 
 
@@ -48,7 +46,7 @@ cd 's6-dns'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.12b87c93b239db5c4b37cecae9e5cf32f3231d65c42da4cf22fb99ff7fba4137/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.f29096c5595e6633734737f4152fa758742e31cea13fc7c417ead0cb84bab142/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/ccx-x86_64/s6-linux-init b/variants/ccx-x86_64/s6-linux-init
@@ -1,39 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+skalibs.12b87c93b239db5c4b37cecae9e5cf32f3231d65c42da4cf22fb99ff7fba4137
-#+execline.ef45cef283c1f6e9c24e90b2ef0b66431057f5869041bb90c2e6ded169f6708d
-#+s6.1065793dcf64a795110171081093831bf37a7515cd303333cf5f79acbc142442
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+skalibs.f29096c5595e6633734737f4152fa758742e31cea13fc7c417ead0cb84bab142
+#+execline.475e8a451084e740445e652be569304b5253cb7ea54f346d356f11f5e1ea03f9
+#+s6.01596fe30512c19492c69acff5d240a57c7bb941df5926c9af1d108109a899ff
 #@git:b298e515efe16210048e504e3aec89ea1e627b73:s6-linux-init
 
 
@@ -50,7 +48,7 @@ cd 's6-linux-init'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.12b87c93b239db5c4b37cecae9e5cf32f3231d65c42da4cf22fb99ff7fba4137/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.f29096c5595e6633734737f4152fa758742e31cea13fc7c417ead0cb84bab142/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/ccx-x86_64/s6-linux-utils b/variants/ccx-x86_64/s6-linux-utils
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+skalibs.12b87c93b239db5c4b37cecae9e5cf32f3231d65c42da4cf22fb99ff7fba4137
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+skalibs.f29096c5595e6633734737f4152fa758742e31cea13fc7c417ead0cb84bab142
 #@git:a9e7acac41a8854546246dd39cb4daee54ead2cb:s6-linux-utils
 
 
@@ -48,7 +46,7 @@ cd 's6-linux-utils'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.12b87c93b239db5c4b37cecae9e5cf32f3231d65c42da4cf22fb99ff7fba4137/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.f29096c5595e6633734737f4152fa758742e31cea13fc7c417ead0cb84bab142/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/ccx-x86_64/s6-networking b/variants/ccx-x86_64/s6-networking
@@ -1,41 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+skalibs.12b87c93b239db5c4b37cecae9e5cf32f3231d65c42da4cf22fb99ff7fba4137
-#+execline.ef45cef283c1f6e9c24e90b2ef0b66431057f5869041bb90c2e6ded169f6708d
-#+s6.1065793dcf64a795110171081093831bf37a7515cd303333cf5f79acbc142442
-#+s6-dns.bb7988982e46b616873e34c9defce1d3a78e62e865fc70c4ccb5633873d792ae
-#+libressl.3ee18387381a6e865f9cc9d7ef9b035d2700a552724d28c3807fd93ac01cd164
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+skalibs.f29096c5595e6633734737f4152fa758742e31cea13fc7c417ead0cb84bab142
+#+execline.475e8a451084e740445e652be569304b5253cb7ea54f346d356f11f5e1ea03f9
+#+s6.01596fe30512c19492c69acff5d240a57c7bb941df5926c9af1d108109a899ff
+#+s6-dns.27ee81a55ba447d41d79f73aec9815508889443386175c34f81112aa7a2971e9
+#+libressl.7b4860d5321ed95c9f8056ac6ca46f2726066c82339065d89aa65619f45b12f7
 #@git:12b40106ed1727274cd6af379c4ba0ca7161700b:s6-networking
 
 
@@ -52,7 +50,7 @@ cd 's6-networking'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.12b87c93b239db5c4b37cecae9e5cf32f3231d65c42da4cf22fb99ff7fba4137/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.f29096c5595e6633734737f4152fa758742e31cea13fc7c417ead0cb84bab142/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/ccx-x86_64/s6-portable-utils b/variants/ccx-x86_64/s6-portable-utils
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+skalibs.12b87c93b239db5c4b37cecae9e5cf32f3231d65c42da4cf22fb99ff7fba4137
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+skalibs.f29096c5595e6633734737f4152fa758742e31cea13fc7c417ead0cb84bab142
 #@git:dc96d8a020e83b16dd7a8bd093bdb00ab2b944c0:s6-portable-utils
 
 
@@ -48,7 +46,7 @@ cd 's6-portable-utils'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.12b87c93b239db5c4b37cecae9e5cf32f3231d65c42da4cf22fb99ff7fba4137/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.f29096c5595e6633734737f4152fa758742e31cea13fc7c417ead0cb84bab142/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/ccx-x86_64/s6-rc b/variants/ccx-x86_64/s6-rc
@@ -1,39 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+skalibs.12b87c93b239db5c4b37cecae9e5cf32f3231d65c42da4cf22fb99ff7fba4137
-#+execline.ef45cef283c1f6e9c24e90b2ef0b66431057f5869041bb90c2e6ded169f6708d
-#+s6.1065793dcf64a795110171081093831bf37a7515cd303333cf5f79acbc142442
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+skalibs.f29096c5595e6633734737f4152fa758742e31cea13fc7c417ead0cb84bab142
+#+execline.475e8a451084e740445e652be569304b5253cb7ea54f346d356f11f5e1ea03f9
+#+s6.01596fe30512c19492c69acff5d240a57c7bb941df5926c9af1d108109a899ff
 #@git:a4756f00b3823952580d1fee704675c6f813a248:s6-rc
 
 
@@ -50,7 +48,7 @@ cd 's6-rc'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.12b87c93b239db5c4b37cecae9e5cf32f3231d65c42da4cf22fb99ff7fba4137/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.f29096c5595e6633734737f4152fa758742e31cea13fc7c417ead0cb84bab142/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/ccx-x86_64/skalibs b/variants/ccx-x86_64/skalibs
@@ -1,36 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
 #@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.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+zsh.a875624a8c2f5f6c6604d187871191282ec0e508a04e02e50da940feb57a5e55
-#+pthbs-banginstall.7f65c9c54e1db4b91d35f49dccb3183fc217c97a8617623a56b58c810608fd01
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+zsh.7a1f16b02b56803d6ca36a1b1dc69ca475e25d7c7c7768a1112c65aefab218c7
+#+pthbs-banginstall.6ad862dde53fc43fdf0a40361245db79b9eac3132f2508bdfa634801dccfd145
 #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep
 
 
diff --git a/variants/ccx-x86_64/squashfs-tools b/variants/ccx-x86_64/squashfs-tools
@@ -1,39 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+attr.fa7777627acb4e171762b37fc5f5914d97c69bc0888083d93cc812180ee7d6ed
-#+zstd.ba081e138e6ae4445d23365c271ad71a3dd85ec47d1de90c053b4c4863b01d2a
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+attr.e7c079e9b59db8fce55da674c6fb21bba141d16778256d1d751149414198c254
+#+zstd.fd3557864d85f019682e733bbdfa57a9aecb76b399f7136be5db7e75ba3180c7
 #@untar:-z:sha256:4672b5c47d9418d3a5ae5b243defc6d9eae8275b9771022247c6a6082c815914:.
 
 
diff --git a/variants/ccx-x86_64/strace b/variants/ccx-x86_64/strace
@@ -1,40 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+m4.9884105ada49333b0deef12f7fe3fef237616eb1f4de54543842fa6e66751a42
-#+patch.7cee5060701fe40e46976123b129248ae396e91511c0c4344e76ebb8a10d498e
-#+libunwind.71d39a8ba7db9150fc9270ef226137bafcf2645713800c5b87a68117eb1e1d99
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+m4.d59e91d2b05cad279f2386e2c5c6f7379312c9bbeb3a1736669dd68e973e0d20
+#+patch.c171fc1f5a838cffcbf2f7960012733c75560bed300b010582b0bc4029688d11
+#+libunwind.ff8e1b7789ae4060fc75e540a2209036691c63b86b2f4613f9088b591cf365cd
 #@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.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-dosfstools.dd4473fcd36714d5c7f48b24c741e9ff25cab8191b8a938120e6555358abaf36
-#+busybox-e2fsprogs.af22f5bfb127967d2c7cb085c11adf98c57952c67846eb568e3ee70bc0800ff4
-#+busybox-iproute2.429a54bf32fac8265b9ca927bae4b7de3af3c5fd9f061a2fa09ac6ba4cfb0547
-#+busybox-iputils.a132882568c16da450b40217627056d9ab070c4a970f27abb67956399e9bb896
-#+busybox-net-misc.e18fe87c787fea5b381f41bb4c5954045853eb5bd036da9ba7d675f5e1667d25
-#+busybox-net-tools.d32bd10ba3881ec71014104edfb977f42e6cfa60dddd407a4b6a81960843bf91
-#+busybox-traceroute.9410980bf85a580538648c725dff21fa68ab62a6ee0f499a1f53b2944fc81356
-#+busybox-wget.82b2601c8a223795dca073c9ebd794bd0a3a4c6d56daef0703f1e19a85b0fe4d
-#+busybox-chpst.22a5d86c0153999d56e756e2e300f10926171c73561cc434f676564ef615bd19
-#+busybox-console.c888a0d94712bbb705b47a277932b730c5302692d11c5dac15a2c8349807d750
-#+busybox-getty.5eed966a1ab5735ab0e1220c7c38e0dc961314edc9629164a58cc77db59ddea1
-#+busybox-i2c-tools.fe087d9620ca5d880fb6cfad84a4ed3ffff59aeffa8aa9d125653fd88b71879c
-#+busybox-linux-extra.10eb4aee15f17e8760b4685f4723cf489123d4d07bae35ce02be5549b905e721
-#+busybox-mtd-utils.201ace78153d39f20186375eef6f2b124307577b94dd7b37e98fb268d8a28f10
-#+busybox-shadow.54ec8e7c4864053589e7fced125ddb03c45c689e1fb1bd4c142e0df47cd963ef
-#+busybox-su.79d4e9637cc186124e8d1a5b72a77ab5f2232dcab7b29b5c797606f424ccfb80
-#+busybox-util-linux-priv.b323daa42a69e3ed4caed2626972642973591c3b6bd5cb9963c249476e4e032e
-#+busybox-logging.a007ecfbd910e6146552d52a06facbd893f7174e6bfe08c395998952f5858542
-#+busybox-cron.c31902ab827a3f2591cac4667ff928e8aa27cca83fec9c883c91778c226d1364
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+nawk.764be91418272983788a47036400b02fd0853b73c0d25e1f87c5f4d8474f2193
-#+diffutils.da2b4486fef6f10f6be614fc3bac358ac546f7d76ffc005e4a08b4f8a5e46580
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+aat.c46f2bdc046083e46f49655db55f6c92acecea8d8169398933c45ba34515349d
-#+fileset.7ca18435d5ef61f9818d2d6624e2ae2544719a78b18f4e62cb32f16fb47a9184
-#+rsync.4540ed2cf7259ea2a1baa33b66bb2f7756db99aa36bfec9fb276f0939be24d6a
-#+execline.ef45cef283c1f6e9c24e90b2ef0b66431057f5869041bb90c2e6ded169f6708d
-#+kbd.ff0763dc3ac20f4ed0eeef4f7bfded62dad2150abb554ae333d03806603fdd13
-#+mdevd.3dc2ef3401ec6cec248695d657775fe278fcc95dd0ff225e537e42faab22783d
-#+s6-linux-utils.a71b562f8f72d67e5649e593d77a25f6fb1947fab8bbbb7419d7e356a95571b2
-#+s6-rc.512a619a9f8e797b02dd701e4cc00b8213f42de38f77eea85f0d2aa9f9cdb295
-#+s6.1065793dcf64a795110171081093831bf37a7515cd303333cf5f79acbc142442
-#+zsh.a875624a8c2f5f6c6604d187871191282ec0e508a04e02e50da940feb57a5e55
-#+libcgroup.0469cde9664df8694a798264b8b6147f2fef87da41e6d20281ab67ffae4aabd2
-#+system-config-scripts.07d1c5ee6c6f8367095e0c677d563e22d1e8fb55bb94288040fafe9b9987b626
-#+logincaps.19343bd403730dc91a5fa19eac15f4730f030af3369f5bfede23ba94ca802e7b
-#+busybox.cfdaf18fc9502934f45ead4ec69633a8e91ab94b210de5f95e96ae66bc58f2e4
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-dosfstools.c9bcaf4a1c2a95450d2fb53581257bf27bcb4c84824c6387e0908c257a932606
+#+busybox-e2fsprogs.54bb7d820303164a42bb414da0ef6749ec1e45d18d06a4b1694e01c38d3447a2
+#+busybox-iproute2.e1c6f823cc7247a2b8345054ca275d4706c4ec4c38d4c359a6b70c0a9f87cab8
+#+busybox-iputils.eb83990d46a3e9089442c7c3ff21539c64bc14d72d02aa48f60e665fa96fe216
+#+busybox-net-misc.791629de33700b1680c0c30e447ac11ca32ede8598b778810aac996e2bef3745
+#+busybox-net-tools.bdd60aee6a8ebaf6e3ed92caba9392d1edce09d5932eeb821fe73f8c2fb7d6ec
+#+busybox-traceroute.9b80dcf8781a63ca32be4152f8e9d0d893e65f52406fdf86e043f432c62b0d9e
+#+busybox-wget.7d365291da2f48646b1d18b9540cc7db9affe94fe849cb0e7daad3edbf7adf63
+#+busybox-chpst.09e7e45709fe060f689cd5eac9ce991fcf698b5b52acf02a65d4e6a43df29ece
+#+busybox-console.70083328c37eb6d45a5c310bf82e2241db91bb0c3f92266098887f4057552815
+#+busybox-getty.7e72fd0b61d1b84e58398e3e3bc3361a2192186722f8f4198fffc7e15003ff66
+#+busybox-i2c-tools.7a62f5b7ece736a528b4d5c39e6904d4b402e6da18a76a4a7b810a4ef1fc278a
+#+busybox-linux-extra.e4b51d3b44f20986326fd139c01649adfeeeeabe9c5d1570ba0226bfd308c416
+#+busybox-mtd-utils.14405293cae08da608e53ddc588c548f06899fcad2909ae684cc78f182af2bb1
+#+busybox-shadow.2ed3fcd69aeac846360ff923e5c4b4102570666f4df3e37244ab0e1ae027a75a
+#+busybox-su.d4fd0607e561de1ce676ba4ba1cc8a30491f92c5f59f48fd964b79a0831793b2
+#+busybox-util-linux-priv.411e3711b3bf8bff170b53dd5b5a75b926bc7d8be4cbff50c8edfe52a290772d
+#+busybox-logging.358c37382f44a62fc90c614f2ab489f6d3d0f20ab08e5837c65da54f1ac9c4de
+#+busybox-cron.db4dc6cdd1b0f7ae42abac61a297afd2d3a917e3a44216a8ae889d4282df9ee2
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+nawk.346b8032668ae11dc1b3c55e656fb59bd37bf644a3b7a7d4e8cacc67cd1f7d3c
+#+diffutils.5c134d14423ce2d3d0b682f78278ce79c8144de6ff2464b4aec16a03324c9bdb
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+aat.545e0046e030e9d58e673151ea3b28559a576eb1171f238877827ae1b766e11c
+#+fileset.43c46f269aacaee274e3a37de6fcdc1bd392d1968930297700a2e7743d078ce1
+#+rsync.f2bcc5a1d759b64ab0c241a3b13c8ba78b73bc2a7180270c15f4f793a086c1a5
+#+execline.475e8a451084e740445e652be569304b5253cb7ea54f346d356f11f5e1ea03f9
+#+kbd.792a42e2004d72225ecfeea4f2cdfe5f9548a68f2655866a8f8e4467e0790107
+#+mdevd.4478a4f21e9273ab12be5c1ca7559cebd3742ea316266163e3a770a4c5044f62
+#+s6-linux-utils.4c36c0f4c6f60845cd973998719f5a2272f3c61c70a633898ea379201c318bf2
+#+s6-rc.74c39873dab64bc6b4f5097e78f3847ea1d6dc25030f7fc7b980e8cc1b168d5e
+#+s6.01596fe30512c19492c69acff5d240a57c7bb941df5926c9af1d108109a899ff
+#+zsh.7a1f16b02b56803d6ca36a1b1dc69ca475e25d7c7c7768a1112c65aefab218c7
+#+libcgroup.1a880767a6c6766d20fbe83041e739649c1e5bc831f7c6ebe163dbb5bc37356a
+#+system-config-scripts.cf6b7350cf83bc871ce6d1a882eff4543cc7b5a2e221b629cfdc023bfaca1522
+#+logincaps.1e59e5c3c7d24dfbda81790497c5e2d4dc2574abe1f96e1f24b0fec8f0493426
+#+busybox.3c90b59fa1a12cd017d08d46cf2979d51c33a17d018f204f88d0e640192e7e31
 #@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.8affd6b5100eb19c5f39b249afe62d88d9e69541a25ab8fa5604d8dae2a54701' \
-	'pthbs_path_mdevd=/home/ccx/versions/env.0a9a5056a6ced3d1ee429235b9cb239589e44a121239c5976ad72ce92e623f67' \
+	'pthbs_path_containers=/home/ccx/versions/env.4d60aeac165ff23070ca12ee2e03c5916156c719d0d7458e70bdba929780e4c4' \
+	'pthbs_path_mdevd=/home/ccx/versions/env.6997e494c7f5ce41c8712a885b521dad93e5a71917d2718519df91e110abf149' \
 	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.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-dosfstools.dd4473fcd36714d5c7f48b24c741e9ff25cab8191b8a938120e6555358abaf36
-#+busybox-e2fsprogs.af22f5bfb127967d2c7cb085c11adf98c57952c67846eb568e3ee70bc0800ff4
-#+busybox-iproute2.429a54bf32fac8265b9ca927bae4b7de3af3c5fd9f061a2fa09ac6ba4cfb0547
-#+busybox-iputils.a132882568c16da450b40217627056d9ab070c4a970f27abb67956399e9bb896
-#+busybox-net-misc.e18fe87c787fea5b381f41bb4c5954045853eb5bd036da9ba7d675f5e1667d25
-#+busybox-net-tools.d32bd10ba3881ec71014104edfb977f42e6cfa60dddd407a4b6a81960843bf91
-#+busybox-traceroute.9410980bf85a580538648c725dff21fa68ab62a6ee0f499a1f53b2944fc81356
-#+busybox-wget.82b2601c8a223795dca073c9ebd794bd0a3a4c6d56daef0703f1e19a85b0fe4d
-#+busybox-chpst.22a5d86c0153999d56e756e2e300f10926171c73561cc434f676564ef615bd19
-#+busybox-console.c888a0d94712bbb705b47a277932b730c5302692d11c5dac15a2c8349807d750
-#+busybox-getty.5eed966a1ab5735ab0e1220c7c38e0dc961314edc9629164a58cc77db59ddea1
-#+busybox-i2c-tools.fe087d9620ca5d880fb6cfad84a4ed3ffff59aeffa8aa9d125653fd88b71879c
-#+busybox-linux-extra.10eb4aee15f17e8760b4685f4723cf489123d4d07bae35ce02be5549b905e721
-#+busybox-mtd-utils.201ace78153d39f20186375eef6f2b124307577b94dd7b37e98fb268d8a28f10
-#+busybox-shadow.54ec8e7c4864053589e7fced125ddb03c45c689e1fb1bd4c142e0df47cd963ef
-#+busybox-su.79d4e9637cc186124e8d1a5b72a77ab5f2232dcab7b29b5c797606f424ccfb80
-#+busybox-util-linux-priv.b323daa42a69e3ed4caed2626972642973591c3b6bd5cb9963c249476e4e032e
-#+busybox-logging.a007ecfbd910e6146552d52a06facbd893f7174e6bfe08c395998952f5858542
-#+busybox-cron.c31902ab827a3f2591cac4667ff928e8aa27cca83fec9c883c91778c226d1364
-#+s6.1065793dcf64a795110171081093831bf37a7515cd303333cf5f79acbc142442
-#+s6-rc.512a619a9f8e797b02dd701e4cc00b8213f42de38f77eea85f0d2aa9f9cdb295
-#+s6-portable-utils.08076985e02dc42224da4d457c978d96fdd9e09448abbec1497eb7ce55e62984
-#+s6-linux-init.4bdcc8b61186e3231ccc6ca723ea9e7d6c4b6c5011f54f80eb8250a91aa016d8
-#+execline.ef45cef283c1f6e9c24e90b2ef0b66431057f5869041bb90c2e6ded169f6708d
-#+system-config-rc.15dc596d787a9468a7dccf5ddb2a68d3b7baa9573eb4751e4efd4122292cb593
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-dosfstools.c9bcaf4a1c2a95450d2fb53581257bf27bcb4c84824c6387e0908c257a932606
+#+busybox-e2fsprogs.54bb7d820303164a42bb414da0ef6749ec1e45d18d06a4b1694e01c38d3447a2
+#+busybox-iproute2.e1c6f823cc7247a2b8345054ca275d4706c4ec4c38d4c359a6b70c0a9f87cab8
+#+busybox-iputils.eb83990d46a3e9089442c7c3ff21539c64bc14d72d02aa48f60e665fa96fe216
+#+busybox-net-misc.791629de33700b1680c0c30e447ac11ca32ede8598b778810aac996e2bef3745
+#+busybox-net-tools.bdd60aee6a8ebaf6e3ed92caba9392d1edce09d5932eeb821fe73f8c2fb7d6ec
+#+busybox-traceroute.9b80dcf8781a63ca32be4152f8e9d0d893e65f52406fdf86e043f432c62b0d9e
+#+busybox-wget.7d365291da2f48646b1d18b9540cc7db9affe94fe849cb0e7daad3edbf7adf63
+#+busybox-chpst.09e7e45709fe060f689cd5eac9ce991fcf698b5b52acf02a65d4e6a43df29ece
+#+busybox-console.70083328c37eb6d45a5c310bf82e2241db91bb0c3f92266098887f4057552815
+#+busybox-getty.7e72fd0b61d1b84e58398e3e3bc3361a2192186722f8f4198fffc7e15003ff66
+#+busybox-i2c-tools.7a62f5b7ece736a528b4d5c39e6904d4b402e6da18a76a4a7b810a4ef1fc278a
+#+busybox-linux-extra.e4b51d3b44f20986326fd139c01649adfeeeeabe9c5d1570ba0226bfd308c416
+#+busybox-mtd-utils.14405293cae08da608e53ddc588c548f06899fcad2909ae684cc78f182af2bb1
+#+busybox-shadow.2ed3fcd69aeac846360ff923e5c4b4102570666f4df3e37244ab0e1ae027a75a
+#+busybox-su.d4fd0607e561de1ce676ba4ba1cc8a30491f92c5f59f48fd964b79a0831793b2
+#+busybox-util-linux-priv.411e3711b3bf8bff170b53dd5b5a75b926bc7d8be4cbff50c8edfe52a290772d
+#+busybox-logging.358c37382f44a62fc90c614f2ab489f6d3d0f20ab08e5837c65da54f1ac9c4de
+#+busybox-cron.db4dc6cdd1b0f7ae42abac61a297afd2d3a917e3a44216a8ae889d4282df9ee2
+#+s6.01596fe30512c19492c69acff5d240a57c7bb941df5926c9af1d108109a899ff
+#+s6-rc.74c39873dab64bc6b4f5097e78f3847ea1d6dc25030f7fc7b980e8cc1b168d5e
+#+s6-portable-utils.797e111cabb6a43a2cb96cca14b66958a9d12463ae4e41e665461f6e279a91f7
+#+s6-linux-init.e4a9e398db1c57cd94a581ae6c0670b267010289e1e84959d0b372b855c637b1
+#+execline.475e8a451084e740445e652be569304b5253cb7ea54f346d356f11f5e1ea03f9
+#+system-config-rc.6f1ad2884329da7256190f91827fd5d194cf286a0f10d0cf0a99386011d16203
 
 
 # - build script start -
@@ -76,7 +76,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-s6rcdb=/home/ccx/versions/system-config-rc.15dc596d787a9468a7dccf5ddb2a68d3b7baa9573eb4751e4efd4122292cb593/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.6f1ad2884329da7256190f91827fd5d194cf286a0f10d0cf0a99386011d16203/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.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+s6-rc.512a619a9f8e797b02dd701e4cc00b8213f42de38f77eea85f0d2aa9f9cdb295
-#+fileset.7ca18435d5ef61f9818d2d6624e2ae2544719a78b18f4e62cb32f16fb47a9184
-#+system-config.be7e4ecbac3efa19a2773ca1d02b3ea55561cb95e7653ac2a16dd3ae384e1872
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+s6-rc.74c39873dab64bc6b4f5097e78f3847ea1d6dc25030f7fc7b980e8cc1b168d5e
+#+fileset.43c46f269aacaee274e3a37de6fcdc1bd392d1968930297700a2e7743d078ce1
+#+system-config.2248cd6ef22a788b5182a32fe8497d9d43bbdd1f1b533f4095e2da5f1e8a28fa
 
 
 # - build script start -
@@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-src=/home/ccx/versions/system-config.be7e4ecbac3efa19a2773ca1d02b3ea55561cb95e7653ac2a16dd3ae384e1872/config/s6-rc-source
+src=/home/ccx/versions/system-config.2248cd6ef22a788b5182a32fe8497d9d43bbdd1f1b533f4095e2da5f1e8a28fa/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.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+zsh.a875624a8c2f5f6c6604d187871191282ec0e508a04e02e50da940feb57a5e55
-#+pthbs-banginstall.7f65c9c54e1db4b91d35f49dccb3183fc217c97a8617623a56b58c810608fd01
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+zsh.7a1f16b02b56803d6ca36a1b1dc69ca475e25d7c7c7768a1112c65aefab218c7
+#+pthbs-banginstall.6ad862dde53fc43fdf0a40361245db79b9eac3132f2508bdfa634801dccfd145
 #@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.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+zsh.a875624a8c2f5f6c6604d187871191282ec0e508a04e02e50da940feb57a5e55
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+zsh.7a1f16b02b56803d6ca36a1b1dc69ca475e25d7c7c7768a1112c65aefab218c7
 #@git:6dfbe33079e2f8c64c5daed29aa1ea3e7e3f2d59:system-config-zsh
 
 
diff --git a/variants/ccx-x86_64/tinyssh b/variants/ccx-x86_64/tinyssh
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
 #@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.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+execline.ef45cef283c1f6e9c24e90b2ef0b66431057f5869041bb90c2e6ded169f6708d
-#+pthbs-banginstall.7f65c9c54e1db4b91d35f49dccb3183fc217c97a8617623a56b58c810608fd01
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+execline.475e8a451084e740445e652be569304b5253cb7ea54f346d356f11f5e1ea03f9
+#+pthbs-banginstall.6ad862dde53fc43fdf0a40361245db79b9eac3132f2508bdfa634801dccfd145
 #@sha256:664430d033e0b491a5ed90cb39cb17cddb57ac0be9f3f2bf014264f3c17d55df:user-env
 
 
diff --git a/variants/ccx-x86_64/userspace.environment b/variants/ccx-x86_64/userspace.environment
@@ -1,93 +1,91 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-dosfstools.dd4473fcd36714d5c7f48b24c741e9ff25cab8191b8a938120e6555358abaf36
-#+busybox-e2fsprogs.af22f5bfb127967d2c7cb085c11adf98c57952c67846eb568e3ee70bc0800ff4
-#+busybox-iproute2.429a54bf32fac8265b9ca927bae4b7de3af3c5fd9f061a2fa09ac6ba4cfb0547
-#+busybox-iputils.a132882568c16da450b40217627056d9ab070c4a970f27abb67956399e9bb896
-#+busybox-net-misc.e18fe87c787fea5b381f41bb4c5954045853eb5bd036da9ba7d675f5e1667d25
-#+busybox-net-tools.d32bd10ba3881ec71014104edfb977f42e6cfa60dddd407a4b6a81960843bf91
-#+busybox-traceroute.9410980bf85a580538648c725dff21fa68ab62a6ee0f499a1f53b2944fc81356
-#+busybox-wget.82b2601c8a223795dca073c9ebd794bd0a3a4c6d56daef0703f1e19a85b0fe4d
-#+busybox-chpst.22a5d86c0153999d56e756e2e300f10926171c73561cc434f676564ef615bd19
-#+busybox-console.c888a0d94712bbb705b47a277932b730c5302692d11c5dac15a2c8349807d750
-#+busybox-getty.5eed966a1ab5735ab0e1220c7c38e0dc961314edc9629164a58cc77db59ddea1
-#+busybox-i2c-tools.fe087d9620ca5d880fb6cfad84a4ed3ffff59aeffa8aa9d125653fd88b71879c
-#+busybox-linux-extra.10eb4aee15f17e8760b4685f4723cf489123d4d07bae35ce02be5549b905e721
-#+busybox-mtd-utils.201ace78153d39f20186375eef6f2b124307577b94dd7b37e98fb268d8a28f10
-#+busybox-shadow.54ec8e7c4864053589e7fced125ddb03c45c689e1fb1bd4c142e0df47cd963ef
-#+busybox-su.79d4e9637cc186124e8d1a5b72a77ab5f2232dcab7b29b5c797606f424ccfb80
-#+busybox-util-linux-priv.b323daa42a69e3ed4caed2626972642973591c3b6bd5cb9963c249476e4e032e
-#+busybox-logging.a007ecfbd910e6146552d52a06facbd893f7174e6bfe08c395998952f5858542
-#+busybox-cron.c31902ab827a3f2591cac4667ff928e8aa27cca83fec9c883c91778c226d1364
-#+attr.fa7777627acb4e171762b37fc5f5914d97c69bc0888083d93cc812180ee7d6ed
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+diffutils.da2b4486fef6f10f6be614fc3bac358ac546f7d76ffc005e4a08b4f8a5e46580
-#+patch.7cee5060701fe40e46976123b129248ae396e91511c0c4344e76ebb8a10d498e
-#+flex.5394cba91edc6b9f5157ff4b94b03b76ed9de8768386d78d1d220acf2f37a13c
-#+bison.636e501a9f34a4a9bbd330542c82ab1c3c976aa060962e07c3f9bae008b3a4be
-#+rsync.4540ed2cf7259ea2a1baa33b66bb2f7756db99aa36bfec9fb276f0939be24d6a
-#+execline.ef45cef283c1f6e9c24e90b2ef0b66431057f5869041bb90c2e6ded169f6708d
-#+s6.1065793dcf64a795110171081093831bf37a7515cd303333cf5f79acbc142442
-#+s6-rc.512a619a9f8e797b02dd701e4cc00b8213f42de38f77eea85f0d2aa9f9cdb295
-#+s6-portable-utils.08076985e02dc42224da4d457c978d96fdd9e09448abbec1497eb7ce55e62984
-#+s6-linux-utils.a71b562f8f72d67e5649e593d77a25f6fb1947fab8bbbb7419d7e356a95571b2
-#+s6-linux-init.4bdcc8b61186e3231ccc6ca723ea9e7d6c4b6c5011f54f80eb8250a91aa016d8
-#+mdevd.3dc2ef3401ec6cec248695d657775fe278fcc95dd0ff225e537e42faab22783d
-#+s6-dns.bb7988982e46b616873e34c9defce1d3a78e62e865fc70c4ccb5633873d792ae
-#+libressl.3ee18387381a6e865f9cc9d7ef9b035d2700a552724d28c3807fd93ac01cd164
-#+s6-networking.8474a7f918c36a7cc539f2e56869d70b281e2091a2332c86264662e395759afb
-#+zsh.a875624a8c2f5f6c6604d187871191282ec0e508a04e02e50da940feb57a5e55
-#+pthbs-banginstall.7f65c9c54e1db4b91d35f49dccb3183fc217c97a8617623a56b58c810608fd01
-#+aat.c46f2bdc046083e46f49655db55f6c92acecea8d8169398933c45ba34515349d
-#+confz.a195c62dc3438e337842c4a9448f3e3fb77c787a877647e170632c4f24a90039
-#+containers.bb29ebb788517e9e167c2d94dc91740c3e198ae26d291b65ce8e25d45e719929
-#+fileset.7ca18435d5ef61f9818d2d6624e2ae2544719a78b18f4e62cb32f16fb47a9184
-#+logincaps.19343bd403730dc91a5fa19eac15f4730f030af3369f5bfede23ba94ca802e7b
-#+snaprep.c6d20a3c8b2544bd9ce73e175508c983471cdf116af6524eb57a3fe95cc57d73
-#+curl.4590ed098587dd94263001ad0710faaaf2fcad17e4a2ab31bc8b917ec4f9b225
-#+git.334b418c3265eff4d5c439c445e33e3d8d14c13c741f7d1c1f009f08898db615
-#+xbps.82082023ff204d2260baae1074d0ca7b5d3cfa59b9f90debceadd2da58b72374
-#+apk-tools.0befde118ec55cc0f336d0a9a7fd40766d7c128d79d876a405d076549e98e981
-#+getent.23c84f01bbd623c59c9501258f3160189710dd5a934271e3104de7ad533decc6
-#+getconf.2cf874cd3fe88746245e2607e6d6decfcd4260156ad3546dd83cd2246602ad4f
-#+iconv.4244e9cef51ba66e306019338bdfa3500c22a6d5e7f6eeb03fb742b29a7abe67
-#+libcap.cdd62774cf0b1502e1d8f06b7a8222d53958e71b3753b7f7090fc2854efa923e
-#+applyuidgid-caps.f9effcbe51b46c1df309463d3c29e36311623bd7f12db9d3cc98247af81d5f4a
-#+ccx-utils.21237b0f8b8c1dfd83b8740ea037c854eefd766d9880e6bdeae8ec2314dfadb6
-#+user-env.744865c18de697a566291f7f2e992dbace14628dcd6df4c8dbeed62fd9713363
-#+strace.5518caa2f8190f73c36ea0a0fa8dede6a20b884a6874ff62f362b0e3f2ea1c64
-#+mlog.4a43328f8aee6e61c66e2b8884b90ad3b6e019cc26401407eb2be6c4e41c2c5c
-#+findutils.9c194f156f0d27d3da7a8be576b0ea570bfae300591a1260bbb4e281d1ec1410
-#+nawk.764be91418272983788a47036400b02fd0853b73c0d25e1f87c5f4d8474f2193
-#+nvi.ff1c93525bb5fefc74586b23a58973e275e5b067a170ec1b4804df335f2787ca
-#+squashfs-tools.ba7a1172fda31f1c2e5d1ad4439477c0c97b2d43e1a336cfecf0fe8e67f407e2
-#+mandoc.04a47d5227be490a94ee7cd2265f9ca5ca0415386551448e6a06d63acdf390df
-#+tinyssh.dc937cfe83137dcfa7bb95da51aaa79fe03235d4f09b233e7b895b632af32054-
\ No newline at end of file
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-dosfstools.c9bcaf4a1c2a95450d2fb53581257bf27bcb4c84824c6387e0908c257a932606
+#+busybox-e2fsprogs.54bb7d820303164a42bb414da0ef6749ec1e45d18d06a4b1694e01c38d3447a2
+#+busybox-iproute2.e1c6f823cc7247a2b8345054ca275d4706c4ec4c38d4c359a6b70c0a9f87cab8
+#+busybox-iputils.eb83990d46a3e9089442c7c3ff21539c64bc14d72d02aa48f60e665fa96fe216
+#+busybox-net-misc.791629de33700b1680c0c30e447ac11ca32ede8598b778810aac996e2bef3745
+#+busybox-net-tools.bdd60aee6a8ebaf6e3ed92caba9392d1edce09d5932eeb821fe73f8c2fb7d6ec
+#+busybox-traceroute.9b80dcf8781a63ca32be4152f8e9d0d893e65f52406fdf86e043f432c62b0d9e
+#+busybox-wget.7d365291da2f48646b1d18b9540cc7db9affe94fe849cb0e7daad3edbf7adf63
+#+busybox-chpst.09e7e45709fe060f689cd5eac9ce991fcf698b5b52acf02a65d4e6a43df29ece
+#+busybox-console.70083328c37eb6d45a5c310bf82e2241db91bb0c3f92266098887f4057552815
+#+busybox-getty.7e72fd0b61d1b84e58398e3e3bc3361a2192186722f8f4198fffc7e15003ff66
+#+busybox-i2c-tools.7a62f5b7ece736a528b4d5c39e6904d4b402e6da18a76a4a7b810a4ef1fc278a
+#+busybox-linux-extra.e4b51d3b44f20986326fd139c01649adfeeeeabe9c5d1570ba0226bfd308c416
+#+busybox-mtd-utils.14405293cae08da608e53ddc588c548f06899fcad2909ae684cc78f182af2bb1
+#+busybox-shadow.2ed3fcd69aeac846360ff923e5c4b4102570666f4df3e37244ab0e1ae027a75a
+#+busybox-su.d4fd0607e561de1ce676ba4ba1cc8a30491f92c5f59f48fd964b79a0831793b2
+#+busybox-util-linux-priv.411e3711b3bf8bff170b53dd5b5a75b926bc7d8be4cbff50c8edfe52a290772d
+#+busybox-logging.358c37382f44a62fc90c614f2ab489f6d3d0f20ab08e5837c65da54f1ac9c4de
+#+busybox-cron.db4dc6cdd1b0f7ae42abac61a297afd2d3a917e3a44216a8ae889d4282df9ee2
+#+attr.e7c079e9b59db8fce55da674c6fb21bba141d16778256d1d751149414198c254
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+diffutils.5c134d14423ce2d3d0b682f78278ce79c8144de6ff2464b4aec16a03324c9bdb
+#+patch.c171fc1f5a838cffcbf2f7960012733c75560bed300b010582b0bc4029688d11
+#+flex.85b7562cb29181ca685ee6e9e4b925ee9eb499989a6b65fac8ae9a07880302c9
+#+bison.4f02e10e21e40e2a298c016d258e52074009b196cb656bfb69a391e67e241381
+#+rsync.f2bcc5a1d759b64ab0c241a3b13c8ba78b73bc2a7180270c15f4f793a086c1a5
+#+execline.475e8a451084e740445e652be569304b5253cb7ea54f346d356f11f5e1ea03f9
+#+s6.01596fe30512c19492c69acff5d240a57c7bb941df5926c9af1d108109a899ff
+#+s6-rc.74c39873dab64bc6b4f5097e78f3847ea1d6dc25030f7fc7b980e8cc1b168d5e
+#+s6-portable-utils.797e111cabb6a43a2cb96cca14b66958a9d12463ae4e41e665461f6e279a91f7
+#+s6-linux-utils.4c36c0f4c6f60845cd973998719f5a2272f3c61c70a633898ea379201c318bf2
+#+s6-linux-init.e4a9e398db1c57cd94a581ae6c0670b267010289e1e84959d0b372b855c637b1
+#+mdevd.4478a4f21e9273ab12be5c1ca7559cebd3742ea316266163e3a770a4c5044f62
+#+s6-dns.27ee81a55ba447d41d79f73aec9815508889443386175c34f81112aa7a2971e9
+#+libressl.7b4860d5321ed95c9f8056ac6ca46f2726066c82339065d89aa65619f45b12f7
+#+s6-networking.b2253acf5de717e72b4db1c14e931f26c7ab06b8c63f5174cf77b6bbf3cb0a46
+#+zsh.7a1f16b02b56803d6ca36a1b1dc69ca475e25d7c7c7768a1112c65aefab218c7
+#+pthbs-banginstall.6ad862dde53fc43fdf0a40361245db79b9eac3132f2508bdfa634801dccfd145
+#+aat.545e0046e030e9d58e673151ea3b28559a576eb1171f238877827ae1b766e11c
+#+confz.6546b02dcdeb82b8ce2ceb97717bcd190f49badae871afe93ef4bd22386cf794
+#+containers.2a8d1e35eb4f4664154e3a04b887d5faffe3e8164e279f6d48be587c7452296b
+#+fileset.43c46f269aacaee274e3a37de6fcdc1bd392d1968930297700a2e7743d078ce1
+#+logincaps.1e59e5c3c7d24dfbda81790497c5e2d4dc2574abe1f96e1f24b0fec8f0493426
+#+snaprep.10e08d7afd15dc4fe043ff1abceac3f24ff4d09d4a11f60daf3520de5ca1ecb8
+#+curl.77ab282a59d0565e190964bf40b28048f07089417f2dd7dc5d4fbc75bce27405
+#+git.1b65d8abd7f156a76a4497b37af4b3cedd4e52abf983255622eea63c9a522481
+#+xbps.5c7933c67ccbc1ef4a926f452cf03e4355ab4353861a603ed33b6ba19120c30f
+#+apk-tools.bdcdcedb47c9a1b15f3ec6596489456cb72265c1cd284c264be2efd31fcf1f0c
+#+getent.91fcfeb24768a1115badb8115fd80dc7726dae72a5f90a568e3df50f3401045f
+#+getconf.b3f1ba0a15d4320332d567bb1e008682a255b7574312579b214452aa314fdbc7
+#+iconv.abbe8cdc1036745b2d2040a911f963868d2ed9529e1ed87e20eb1cf4072b0df6
+#+libcap.ee2b20ff028cdbfa5b09db3834a9500eb678963ee972af38c46a2a000d9c61ee
+#+applyuidgid-caps.9bed1d6c14bf56c2afb714610d64ac9916a59af676067dda556c0688893c06b8
+#+ccx-utils.006c7ef351618261d80134c5d57ebad1638f9d88751519e285f453cf5989321c
+#+user-env.d9263c530a4cb34fb334eeabcdcbf4a92dda444ddc58d197d9572e31ac8de39b
+#+strace.43ab7a4ffdcf5cc91dbba8dd7bf567c2609b0b782a6230266a6036fbf1796f7d
+#+mlog.b19670b8c896b53e57e11aa401dd78175500593767f343a8416c592984bc62f1
+#+findutils.784f4cae35b89b0a109b58c374a370d40a86b7fc91549afea7b82031164224f7
+#+nawk.346b8032668ae11dc1b3c55e656fb59bd37bf644a3b7a7d4e8cacc67cd1f7d3c
+#+nvi.c534511cfe918db0623585fda0f381ff4be2bcc9f0dec0f1b6be19dd27a2b53f
+#+squashfs-tools.ab8227f3b68301695982b4778a05b5c50c73362170d14a3ce42ab2d475cfceb3
+#+mandoc.71e2183d5a24018d44d556c2d31dba72a0787ed2e59ba45621e7355ac62f7f0f
+#+tinyssh.425a0ff58a464815ba68ea5c62280210ff7dc2ed42d20b410b52c40b41e9f85d+
\ 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.daf8c8e960434ebac0990c656f5c27ad0d8ac7831d0a3d8c35910e372e934cf0-
\ No newline at end of file
+#+linux-qemu-guest.f7037bf8627090edbe9121fd443cad9c7603f7fa66cf338c9f8c957ff9fd5a46+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/xbps b/variants/ccx-x86_64/xbps
@@ -1,39 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+libarchive.9d462537714dd5262fffc4ece174467cbfd5c7f597389c96d6c911727f27525f
-#+libressl.3ee18387381a6e865f9cc9d7ef9b035d2700a552724d28c3807fd93ac01cd164
-#+pkgconf-pkg-config.5b602480e706af645071762d9b1551932f277d981f9a628d3528fd303fe5b0bb
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+libarchive.b2d1bba0a541cb36ffa326c3f707838ca46a83f0f5149ed026b810d2740be737
+#+libressl.7b4860d5321ed95c9f8056ac6ca46f2726066c82339065d89aa65619f45b12f7
+#+pkgconf-pkg-config.7a3098acfd74332fd15ada57749e6427388f516defc07c6475c22c6babd34fdb
 #@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:.
 
 
diff --git a/variants/ccx-x86_64/zsh b/variants/ccx-x86_64/zsh
@@ -1,40 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+m4.9884105ada49333b0deef12f7fe3fef237616eb1f4de54543842fa6e66751a42
-#+netbsd-curses.39ba72dd4e237c6f440a1bd3056a734e0e792e09ef3f7e5e96514b4396241eb5
-#+libbsd.de533c0dce2a6ab7517619a3c9e8613b145cfa450d12e097dca44a2900e8399b
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+m4.d59e91d2b05cad279f2386e2c5c6f7379312c9bbeb3a1736669dd68e973e0d20
+#+netbsd-curses.c0cfcb49a978c41f512af2d7b65777aef30b3f80debc259077ffd13415dfcbcf
+#+libbsd.a45840f14dcfd995ae98f1a48f7ae77d50d1dc49f86f3ebebc48ff9e3ab4bd45
 #@git:c73505cc47870bd09e8e204d98ac5976e0d4cb52:zsh_config
 #@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:.
 
diff --git a/variants/ccx-x86_64/zstd b/variants/ccx-x86_64/zstd
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.47cc084b68997893c886af91c697004d9ddb4d493aecea46cd9c7dbf73184f3a
-#+busybox-bzip2.8bbf51cdf4f43f4732e63f1c18b5db48ee0e9160e7af39e734f2153c1405fbf5
-#+busybox-gzip.54e57389cb2e68cd66caf48764eda17d0191184bc7e06a0855dee201a6a218bc
-#+busybox-lzop.ebba111e91b7759def2e17d9107de675b7f92ac5e2ab245549c2d4c70ea0d972
-#+busybox-unzip.0d2e706978e970fe9b4c4aa55af826b28df85f2ce5f26594f2530eaeb19c7ab2
-#+busybox-xz.950c3c87d0c842a11f670efb1363e510891407683616c8ccdcf830b321535817
-#+busybox-cpio.6e225832076646c429c9329231d99b9b4757819da4bda692b17753d9ad6ee0a1
-#+busybox-dpkg.1db6b40e8368fabfbf8ca5ceb69c3cb390aec592db4121451c5a4c036e3c01e0
-#+busybox-rpm.0e77f2ae69e9d9c9833b4a8c35ed65ff531dc4d8f7b84db78edac7fa28da0cbf
-#+busybox-tar.0b17b34e062308ce4cedc6e8ffa4b307d346282847e8140d1f49e4738d662811
-#+busybox-ed.bbd0de0989705e7de99d48a636ceb811c31f3ae4d515794a98934d7990e044ad
-#+busybox-sed.018e2b2b62e591d6c3bed29a6454c772e1beb35caa640047a029125d989941d3
-#+busybox-vi.6981e1c9a2c8e644fae6123fa1c219e3d2e153463506044ff29f2e765598dffd
-#+busybox-xxd.4fca7b3596cc8cc10cbf98fcae33237b0fc9e058403022593f038674c75607ed
-#+busybox-process-extra.6287fcb9be26b05e3591c72af7b6b16eebd7783003480fbd67947c7e4162f6ab
-#+busybox-procps.dd74e3c8c5e236f688866d4d8dddffcaada14ce06d897ff4773e943fb605f238
-#+busybox-psmisc.4beb588773df91eae2990d35c3f603e28a06e40440e5053802214b4a6e1992f4
-#+busybox-ash.921b76acb7f879c227d4e12620af242ab601768b7ee703f6d23b2dddd436145e
-#+busybox-bc.975383b0f3a5bddba6882595b43080c011b2e3f6f72d26b29b773a4ce985c87d
-#+busybox-coreutils.df39a1ec6355a649dd3be113530548a466da60fbe92379a9ecfdfc1e4055a3f5
-#+busybox-coreutils-extra.0239ac2c629fb1e64522cf40b49c5761c5af128362d40be4c5695ef3a626b0a4
-#+busybox-daemontools.94d6e079d12d881cf9c5399394718ed4b0ff68a8eda1c4b63980d2306f90fc9e
-#+busybox-grep.a09f56ad826ad24e90d0c640b7fe44aaf95c416632618e70ebc62c24d187867d
-#+busybox-misc.a523833fe554fd919dac8dd7aa24104036976d69751e49af037805498849f4e5
-#+busybox-sh.6662d1890bdf5df594f919d05f8a8cb8e13e21d6df1cb4d8173bebd42be309fa
-#+busybox-util-linux-unpriv.e82f4448cea95bdb4ed23d19542ee8e74b4c8ac7d4c3a555a901438ee607d33b
-#+busybox-findutils.abaced48990fd575b1e0543705bd0276fdcd80ae9d6ad6122c89e99e6772be84
-#+busybox-awk.12c7a3b647fc0ed0cd588683710f0ec40e5ac882f64b98eb8f3d2c11a98f0111
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.53daa8e506730591bc5ee443e43508fccb5b29e86a2046e3d17e4d1b6c67fcda
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.34d25483b84820d2f5386e1816e6eeaf07f51a58b3f6cbe83fb151bb335560c2
-#+busybox-diffutils.66185ddefdb4406984784dbddceef7f999fca74f82eba62e541a8d20e9d638fe
+#+busybox.ab12f8126ebc2d313885a5fb767de9fb88f73b44665f15e79ca7ac583165dfbb
+#+busybox-bzip2.d836362e089a8eceac6783cd03105b4d0aec31511bd8127b39f0194f177b7454
+#+busybox-gzip.1a50d6e95d8a3a6fd22fb9960ec92da0b850cd7bea9f980ac4ff2345a5f9a3e1
+#+busybox-lzop.09849f36b40b6e385f9f3f447efedd511d9246725afe94f2e9795c0c035b3885
+#+busybox-unzip.accc4a2830072b1a72974c58a6fd58c875982c7d7d6d29f4466894f8c3a02051
+#+busybox-xz.95273dbc7513150f27b841283a8efb78de38c3366fad474bbc53173eb433ae25
+#+busybox-cpio.ea562ee00e21e0dbadfada6bdf35ad1eac4e1946ba2d866b45c6d817a8e747f1
+#+busybox-dpkg.d4824d1cf922032533e1ce77cf095b236cb9c12cf2825957c8047b2aa50122d4
+#+busybox-rpm.d6b15a0efd98cc31f413cad60a691d77a35ad9449a581dee9a3e83210f12c794
+#+busybox-tar.d40d70dd8dc400f90b83db25d0e929dbbc8b8364b0451412d2346e3b2ef7af26
+#+busybox-ed.2baf356af96dbbc63d146b3afd3265e48dd063f9e9dae92d8fa6da729d041caa
+#+busybox-sed.11f837cf69be9903749bb69a3e326638d3c2640dad77e5d6b4134c6d38a81f60
+#+busybox-vi.8ee9626d18bf0e344204b4da9a121a0dca70564f2cbe8e09f5f1bbf132d23be7
+#+busybox-xxd.703992be7160fdaac7ed2c0dbf6b3075688e859d93c3d58ebd72b07b856854e7
+#+busybox-process-extra.9fd2c206424e22ea52706d4c4faf35e05477d146c6532f5c1ea429d37cb18c19
+#+busybox-procps.9a3f05f0daad64735694193b64dcf4e0d5418ddcc120f8be0e88d54e749c2063
+#+busybox-psmisc.af7c0fd84e06718e1de6d890dd4ccb02a54a901f82e71a8d27890b51109abf6b
+#+busybox-ash.3e309773f510f96ccbca193001c1970d6546bbf88a6d45175fdad573d8db0e65
+#+busybox-bc.b394d484c7850233b32182349144b44c2468440c5680ab90609ea8b779007b91
+#+busybox-coreutils.2bcca8a24e7e3822ada3369014d39cd8a276cf8eefe908af4e2eab2883f29d40
+#+busybox-coreutils-extra.cfa0f8f1df7681ca15fd5c2f7723e5c7e4c2e9d9a97f9ad5df64ce3760feb877
+#+busybox-daemontools.77a2034a32dcc18254e092831077eec859cb9034468c6926ac2e19f73292aa1a
+#+busybox-grep.519210d4e9af514ebfcf1e322930ec1bb53b522c8aeb1edc567f9e91d7900b79
+#+busybox-misc.9e633605f942270798cb425ed2d7a8e6f0c2a5ffb02033e4f590642b28d0dd11
+#+busybox-sh.dc3bca2242f7eab90e2996d984eefd0ec3afd33f686db3dce720fc32c48d5d79
+#+busybox-util-linux-unpriv.dba98c29a14f281e7f8e83d3c4b2618cbabcf5054b892aa1764ba23536f512c9
+#+busybox-findutils.ea42d9249b8db67b0b6987d17f8274b2481769845f0855899e689625542cecd6
+#+busybox-awk.537ef5a83f7f6aafed7bce170e760274eeac743641436ec1035bd9dc714ff3fe
+#+musl-cross-make.b413b69d2f707e43934eb63c4e86e84e4395050f8aa6b94875d4a05869536cf0
+#+gnu-make.5d6189fee2faca471dc4022976a02587ac01b1fb0dd45eb5dc8ef60ed5b97cc0
+#+busybox-diffutils.e742d2fd948588502f6a70a76d95a8a98606dfec81eb001e0a0610d30fad68b0
 #@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.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+zsh.786b35599b47e5a64e8f64b6853fed96325776545db70e7c5d41d519337e8668
-#+pthbs-banginstall.e0b92a53563e59c27563cff50c09e7fe23b02ec2b5114f78c7e6cb4902467c48
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+zsh.52c232b069e8cfa3d25529f8680f9b793eb9ecbd805f5f44942c61089e0934a7
+#+pthbs-banginstall.11a4dfa7bbf19f57643e1f71dae30a17ee21b42960bf46b4328cc685c50d8204
 #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat
 
 
diff --git a/variants/root-x86_64/abduco b/variants/root-x86_64/abduco
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
 #@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.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
 #@git:c7b36ed27103ee3f9aa01905ba1fac2d606079cf:alpine-keys
 
 
diff --git a/variants/root-x86_64/apk-tools b/variants/root-x86_64/apk-tools
@@ -1,41 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+patch.f96ad537c882a1bed9479ea978ccc31fbcbee68a1d18a5deb9003258bc58f2ce
-#+libressl.6946b4de4f6a6da96980a9b0e95157a75850c4bf9a93c761c8d6f9ab918c6e7e
-#+zstd.78d52b3e7f0cfe343a81f7e5932a4469e0ec04d33e415fae0fd5821f099f89ca
-#+pkgconf-pkg-config.b381deb533d10dae9e9a3d187ee1205dbe64391747ad636cc313962048ac103b
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+patch.a7f1a33763eeb4c7728022e5cf4f69c537c12ee97b8de5b76610f2fde144fa84
+#+libressl.737550246c5f7966d58e66007cd0328a5a10af72c47b86189c7bd24d02903b40
+#+zstd.4d0316139a860ab98a38660f734fae196cacdc04bf56f4d45b0a692d06473fe1
+#+pkgconf-pkg-config.ca7cc47c4b1a0e7593e5ce1c40ebf06089a3dd467090441266545e3804dc4883
 #@sha256:4b32a05f12c3d29befb210c88c415f7c7affd7e351b9e96b0cfde50773d22dbd:apk-tools.patch
 #@git:9d074efdc12bc41b5d24190595a5269a770e852a:apk-tools
 
diff --git a/variants/root-x86_64/applyuidgid-caps b/variants/root-x86_64/applyuidgid-caps
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+skalibs.a27479ee71afba38615e09103dbe1e5559e6ef9c756c5deb8217626dbe0a84ed
-#+libcap.c34b2ea3e798da1b9e2ed6048cbcdbe14de0e34dfe4dddfceb45eeefecbce285
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+skalibs.d52c18eb24868694a2361276e9de0be604913ee74428ea7a2eb5bd9cb9349b14
+#+libcap.b1ee55e09f1c9a2ed427132f4248421b06264f0c08cf48f042bf87eba98ba842
 #@sha256:818a5ad7061ab1a740a5c2e7d7d8cdcc7be7e84e3f04b479731cf94ff1f1d093:applyuidgid-caps.c
 
 
diff --git a/variants/root-x86_64/argp-standalone b/variants/root-x86_64/argp-standalone
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+m4.a52b544a61e3d3890392553a1c63a5c3ee7a4c4c5d0c7685ebfb9f828a3ef2bf
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+m4.4883a41081b9cdff29d76e24ccadd5dea8897716f9e5b20789d7489c2db62170
 #@untar:-z:sha256:c29eae929dfebd575c38174f2c8c315766092cec99a8f987569d0cad3c6d64f6:.
 #@untar::sha256:a4facc0856b512ad8ab5aed7b07e14a9629aaf042b1e92377ba22fcfc4c4205b:argp-standalone-1.5.0
 
diff --git a/variants/root-x86_64/attr b/variants/root-x86_64/attr
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+m4.a52b544a61e3d3890392553a1c63a5c3ee7a4c4c5d0c7685ebfb9f828a3ef2bf
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+m4.4883a41081b9cdff29d76e24ccadd5dea8897716f9e5b20789d7489c2db62170
 #@untar:-z:sha256:39bf67452fa41d0948c2197601053f48b3d78a029389734332a6309a680c6c87:.
 
 
diff --git a/variants/root-x86_64/bison b/variants/root-x86_64/bison
@@ -1,39 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+m4.a52b544a61e3d3890392553a1c63a5c3ee7a4c4c5d0c7685ebfb9f828a3ef2bf
-#+flex.e03fc54a9d85f6ca301fd813c1b12ca06cef79c60017ed22db3902e7fa893ff8
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+m4.4883a41081b9cdff29d76e24ccadd5dea8897716f9e5b20789d7489c2db62170
+#+flex.fc0768f60cfea619079286fc2694c1d39541706719fc9aad705a3ef92a4ceea1
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
 
diff --git a/variants/root-x86_64/busybox b/variants/root-x86_64/busybox
@@ -1,7 +1,5 @@
 #!/usr/bin/env pthbs-build
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
 #+gnu-make.e4a639067dbdc87f724a0af3861ce3ec1fc8d2ad5046d28f7e687b5ac6e9cc7e
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
 #@sha256:31b8f61d2173fa36d4409e8e91f52088691d6ba4db13efe19ea7ae7512e64275:busybox/.config
diff --git a/variants/root-x86_64/busybox-ash b/variants/root-x86_64/busybox-ash
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-attr b/variants/root-x86_64/busybox-attr
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-awk b/variants/root-x86_64/busybox-awk
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-bc b/variants/root-x86_64/busybox-bc
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-bzip2 b/variants/root-x86_64/busybox-bzip2
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-chpst b/variants/root-x86_64/busybox-chpst
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-console b/variants/root-x86_64/busybox-console
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-coreutils b/variants/root-x86_64/busybox-coreutils
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-coreutils-extra b/variants/root-x86_64/busybox-coreutils-extra
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-cpio b/variants/root-x86_64/busybox-cpio
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-cron b/variants/root-x86_64/busybox-cron
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-daemontools b/variants/root-x86_64/busybox-daemontools
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-diffutils b/variants/root-x86_64/busybox-diffutils
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-dosfstools b/variants/root-x86_64/busybox-dosfstools
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-dpkg b/variants/root-x86_64/busybox-dpkg
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-e2fsprogs b/variants/root-x86_64/busybox-e2fsprogs
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-ed b/variants/root-x86_64/busybox-ed
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-findutils b/variants/root-x86_64/busybox-findutils
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-getty b/variants/root-x86_64/busybox-getty
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-grep b/variants/root-x86_64/busybox-grep
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-gzip b/variants/root-x86_64/busybox-gzip
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-i2c-tools b/variants/root-x86_64/busybox-i2c-tools
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-iproute2 b/variants/root-x86_64/busybox-iproute2
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-iputils b/variants/root-x86_64/busybox-iputils
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-kbd b/variants/root-x86_64/busybox-kbd
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-linux-extra b/variants/root-x86_64/busybox-linux-extra
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-logging b/variants/root-x86_64/busybox-logging
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-login b/variants/root-x86_64/busybox-login
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-lzop b/variants/root-x86_64/busybox-lzop
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-misc b/variants/root-x86_64/busybox-misc
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-modutils b/variants/root-x86_64/busybox-modutils
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-mtd-utils b/variants/root-x86_64/busybox-mtd-utils
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-net-misc b/variants/root-x86_64/busybox-net-misc
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-net-tools b/variants/root-x86_64/busybox-net-tools
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-process-extra b/variants/root-x86_64/busybox-process-extra
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-procps b/variants/root-x86_64/busybox-procps
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-psmisc b/variants/root-x86_64/busybox-psmisc
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-rpm b/variants/root-x86_64/busybox-rpm
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-sed b/variants/root-x86_64/busybox-sed
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-sh b/variants/root-x86_64/busybox-sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-shadow b/variants/root-x86_64/busybox-shadow
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-su b/variants/root-x86_64/busybox-su
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-tar b/variants/root-x86_64/busybox-tar
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-traceroute b/variants/root-x86_64/busybox-traceroute
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-unzip b/variants/root-x86_64/busybox-unzip
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-util-linux-priv b/variants/root-x86_64/busybox-util-linux-priv
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-util-linux-unpriv b/variants/root-x86_64/busybox-util-linux-unpriv
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-vi b/variants/root-x86_64/busybox-vi
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-wget b/variants/root-x86_64/busybox-wget
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-xxd b/variants/root-x86_64/busybox-xxd
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-xz b/variants/root-x86_64/busybox-xz
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
 
 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.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+certdata2pem.8bc0a5296df4bba4c08a5728206ad09165150ab8a78ec36078f9fb8d9b8660cd
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+certdata2pem.d4a3a802fe42ce4a3eb060aa247e394e76318d8fc5d08a90bb6a3d26b4ab9ff7
 #@untar:-j:sha256:6ef7bc56cc0e0b307d99a3c494119686091cc1d4ad08986d68aa089dd00c7788:.
 
 
diff --git a/variants/root-x86_64/ccx-utils b/variants/root-x86_64/ccx-utils
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+skalibs.a27479ee71afba38615e09103dbe1e5559e6ef9c756c5deb8217626dbe0a84ed
-#+s6.e97bd84122cca75a7b68f68889496be7a5609e4a94bfa4a337e2787dcd79fc15
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+skalibs.d52c18eb24868694a2361276e9de0be604913ee74428ea7a2eb5bd9cb9349b14
+#+s6.2fcd8917da46cad0ccaa860ae3f5516dc321f0534f674d390ae62b9c931c67ee
 #@git:461a9ec198c1e2b9c39a34e21786747dbb8671b4:ccx-utils
 
 
diff --git a/variants/root-x86_64/certdata2pem b/variants/root-x86_64/certdata2pem
@@ -1,35 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
 #@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.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+zsh.786b35599b47e5a64e8f64b6853fed96325776545db70e7c5d41d519337e8668
-#+pthbs-banginstall.e0b92a53563e59c27563cff50c09e7fe23b02ec2b5114f78c7e6cb4902467c48
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+zsh.52c232b069e8cfa3d25529f8680f9b793eb9ecbd805f5f44942c61089e0934a7
+#+pthbs-banginstall.11a4dfa7bbf19f57643e1f71dae30a17ee21b42960bf46b4328cc685c50d8204
 #@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.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-dosfstools.85c86ff0d269d53af70def72a9adddca737d70096043e3720792b02a4f4e25e3
-#+busybox-e2fsprogs.63818428105760e9b1bafb5cc765e3f1e2939ec127a4b08d957df9cde2599466
-#+busybox-iproute2.54ccee32719b2c0bb9f3d6cbd8dfd4c09062bb681af18e3ed994cca45fd330bd
-#+busybox-iputils.64b19952b26879cdbfdd32257e2f486f7d2e8b52f719fa7ec10c8b41552bc9c8
-#+busybox-net-misc.61dc15f76bf37642e30ed621e47337af0eb5719e6ccca24416e3fa979843713f
-#+busybox-net-tools.918e7f0dfb89e5df9c809eef8c061dd19fd4b2ab75625829e7640e44ec5c9463
-#+busybox-traceroute.90e9e1797ab14371f20ebc76a2fff0ba875faceb0f4359c2f4e5ef55df75bb34
-#+busybox-wget.729dd834ffdba7ad76dd914b2dd5352ce58130a0f6b17ccef1097c9dce3d33ad
-#+busybox-chpst.f90fe836f75107df9aff6142c549709370f688fec811797cd72d2b2a01c671a0
-#+busybox-console.d191b9c51818690757189fc5c98999183d51283be01e9446da1554425d025a93
-#+busybox-getty.1a0dfbe78dc9e417c1cdc9773f885d5f05d61535b3f58a3bb8d1b3711fb9a849
-#+busybox-i2c-tools.bd159e2598756b7065567411d22cde9cc72329765d1a32da6a0956442502b403
-#+busybox-linux-extra.57e2dcccfb6b1e2393f5a1dacc6b1dfc71f3c1a9e6dd0fe56b421ff225c17b94
-#+busybox-mtd-utils.664f71e3e7cb1ea13912476516b826db27a0392de13c060685c0f29c49f862ab
-#+busybox-shadow.76d726bbb8df5d6ee42c0f32cd280a91eb94f0949dba7421487dbe4583c90d3a
-#+busybox-su.87c2dfbabec12790378c5feeaab4012a3b98f08ac16fa30c6a064f971c75436b
-#+busybox-util-linux-priv.88f0e5c221f24105bbee2a6e84fcd72481dd39702b0b633b733e81a4b4598ed7
-#+busybox-logging.97c5602ed84ffb239611645e58d0c97a07b505fcefabed885e4f8410e8b282cf
-#+busybox-cron.3afe963ad428f47f2b53382cc62b40f7f168b41d1468061cc5a56a5ecf60d2c7
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-login.909a1b0d6da3ecde19e35a85e9ac60e3d12dd1c32640b9d9bcc3cf7003428752
-#+execline.62309d4bece25d9fd9801a7e9e9e4a97e5a26cc6d8b6ec40f2420ecf0e22a677
-#+s6.e97bd84122cca75a7b68f68889496be7a5609e4a94bfa4a337e2787dcd79fc15
-#+ccx-utils.cd8e6ae95f0aecc4d3e2d82b89cf18e514d4d8ebd4d6e1692f70b6cae4fee221
-#+applyuidgid-caps.dfc0c85465799451d6cd64d8fd6a2911b6d010e7a9475e8ee9f1bb37ba4f9051
-#+easyseccomp.7039e9df60d515ae930afb80a1ad0bc473a023fbfefb6d9823c8634c69e1c081
-#+mlog.23609677a49ced82691b8340351b9328014ab148672875ed8de0af015732f619
-#+abduco.55dcf700cfaeedb149e02c4cf6e8bfcb7222b7b236576e361d897d85ff161320
-#+nawk.9ffe9e8ced505282f9526814564a6fbd53b46a34c3c533cdbeb35679a5986805
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-dosfstools.52bc4ff96892385af5010d7eb2c7b81bd82a92ab8dae9ea9442a1e3907cd2356
+#+busybox-e2fsprogs.4da2840b28884a7ff7eff7d9166e3527b4dfb67a463307259875be056315cdd2
+#+busybox-iproute2.5c4a71bc1015c624bee6630b1d5bb1f0f4b9b5188434d241bd45e9824ca900dc
+#+busybox-iputils.b7cddd6f32d789bbbda1d7debdfa9503d4900bd75f45ab5ed5cc33ccbcaf8d75
+#+busybox-net-misc.856cd9fbdccba7e9270791cbb8f81d16a4b785f2a0a9097619a7c074ea1a7448
+#+busybox-net-tools.c4e96b330fc28c88140911e96462a931fda1ed30165e205b5afa71d86f572392
+#+busybox-traceroute.0599ec936adfdc56c68c19cca030a61efcdddba960b35728c846a0a68467399a
+#+busybox-wget.a0994072aab7d10e281293d288981ef31db5ea77015b6b6b7067fbb0f6d9b6e0
+#+busybox-chpst.35150e3653a1a85065d295d1fd896dd335286b199fdabbabc446b5a50b09f891
+#+busybox-console.9f778c9f338b33f978d8bb48c931f62f2710421ba46e53d08de7e9ae42151162
+#+busybox-getty.5135eca5f521d03c7ba7b4ada57cefdf08c8c3d9a8675895dd2c4037fdd7decf
+#+busybox-i2c-tools.44579eb7f7b4c2c95c69bcc2d8ca205396f86ba12b165852c2b3ed7a3265c6cb
+#+busybox-linux-extra.1f0f5dac6a84f72fa1aa9eb8180743900c431184f578d6a96e3a4c1b665b9f76
+#+busybox-mtd-utils.22f838bd0436ffdfab9749eb2b46b9099fca29651c2e00d0d444aa3e96b72d7b
+#+busybox-shadow.cc8ca5cbc3645e6b024fb0c21ea2b4dc6550796c7e6042ddfd165d42c42623f6
+#+busybox-su.05e8fb55f2e28680baa38aaca217d1e2bd5d0bde513946d919046438121b0512
+#+busybox-util-linux-priv.0267a11624ca9ed5364e0bcf9bbd79769157f3e7e06c1bcba398ce18f20f7e68
+#+busybox-logging.0242130f83cfcc7cd9a18b887b68e875da070e849b7290c19abea7872db21806
+#+busybox-cron.6b6765827e1dc2d52c5c77f024483201b6d381551fd46d6f98406ab3a5c069c2
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-login.f1fe535079e25636dfd22a13764d0c83653fb0df658575bf363dfad8768a3611
+#+execline.5597cefe7a3464a1a03ef20a49a1aefb98ada3e016a0c3331ad0023ad8647ec3
+#+s6.2fcd8917da46cad0ccaa860ae3f5516dc321f0534f674d390ae62b9c931c67ee
+#+ccx-utils.8f56efdd62d14d99fc9afc488e3a725b5fd4e81fd67150277c38c8a069bbf347
+#+applyuidgid-caps.6da83209122a58787cec038960dd8f2a41ec7b5a407f8371d7634d8d2085c2a0
+#+easyseccomp.2f42156b0846de477488d9dc7e4523868a156e0792889226991c892a4da499c6
+#+mlog.fc2b33e682d61377e02d4ddfb1623771daa954eb96e0f8ff4a78a0d8006e3016
+#+abduco.4ffefd4926a8ac0b6d458b8db9a61ffae073a4dcb794b1a2d637570ef8be6cbe
+#+nawk.a45f17510ace9517b9d7c542d513276f0f6ac6b18fa795e3ece69be76dfdcdaa
 #@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.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+zsh.786b35599b47e5a64e8f64b6853fed96325776545db70e7c5d41d519337e8668
-#+pthbs-banginstall.e0b92a53563e59c27563cff50c09e7fe23b02ec2b5114f78c7e6cb4902467c48
-#+execline.62309d4bece25d9fd9801a7e9e9e4a97e5a26cc6d8b6ec40f2420ecf0e22a677
-#+alpine-keys.8cfb93325d6f962b6c307cce2f89c4684aca7add2d976625ff8ecfad2260e76b
-#+apk-tools.d7f8ada88ff253d290bcc916be4269b525f2de37bbdde9a30718c364906c3a56
-#+xbps.94dbf6e35bf4caf6110fd17386ece2641d49a8c016466c673ce34847c992f030
-#+container-bin-image.2698351387fb70975423b3cb04a27f5f069b5cb02d717820adf1ac233d1918b3
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+zsh.52c232b069e8cfa3d25529f8680f9b793eb9ecbd805f5f44942c61089e0934a7
+#+pthbs-banginstall.11a4dfa7bbf19f57643e1f71dae30a17ee21b42960bf46b4328cc685c50d8204
+#+execline.5597cefe7a3464a1a03ef20a49a1aefb98ada3e016a0c3331ad0023ad8647ec3
+#+alpine-keys.eb90bd515fa5d5f3d8ae764cd1e9a936e0cefb029d00ccd7141dcbbe8bda05c8
+#+apk-tools.e09162294416fd3f716bfad8a2a6c091bb55d6a3e7f9d9ceb98bb383ed08a49f
+#+xbps.4d1bcc0f5d86a23cc8d4fe9c92793156d8e240bdd59286fe2d9b855c90094be2
+#+container-bin-image.5a9795319106b456254c88c3fc59b451fc70ff03481d37211dd1a6c0be0da711
 #@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.d7f8ada88ff253d290bcc916be4269b525f2de37bbdde9a30718c364906c3a56/command/apk.static' "${dest}/deps/command/"
-ln -sf '/versions/xbps.94dbf6e35bf4caf6110fd17386ece2641d49a8c016466c673ce34847c992f030/command/xbps-install.static' "${dest}/deps/command/"
+ln -sf '/versions/apk-tools.e09162294416fd3f716bfad8a2a6c091bb55d6a3e7f9d9ceb98bb383ed08a49f/command/apk.static' "${dest}/deps/command/"
+ln -sf '/versions/xbps.4d1bcc0f5d86a23cc8d4fe9c92793156d8e240bdd59286fe2d9b855c90094be2/command/xbps-install.static' "${dest}/deps/command/"
 
-for f in '/versions/alpine-keys.8cfb93325d6f962b6c307cce2f89c4684aca7add2d976625ff8ecfad2260e76b'/keys/alpine/*/*; do
+for f in '/versions/alpine-keys.eb90bd515fa5d5f3d8ae764cd1e9a936e0cefb029d00ccd7141dcbbe8bda05c8'/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.8cfb93325d6f962b6c307cce2f89c4684aca7add2d976625
 done
  
 mkdir -p "${dest}/deps/keys/void"
-for f in '/versions/xbps.94dbf6e35bf4caf6110fd17386ece2641d49a8c016466c673ce34847c992f030'/keys/void/*; do
+for f in '/versions/xbps.4d1bcc0f5d86a23cc8d4fe9c92793156d8e240bdd59286fe2d9b855c90094be2'/keys/void/*; do
 	ln -sf "$f" "${dest}/deps/keys/void/"
 done
 
-test -d '/versions/container-bin-image.2698351387fb70975423b3cb04a27f5f069b5cb02d717820adf1ac233d1918b3/container-bin-image'
-test -f '/versions/container-bin-image.2698351387fb70975423b3cb04a27f5f069b5cb02d717820adf1ac233d1918b3/container-bin-image/if'
-ln -sf '/versions/container-bin-image.2698351387fb70975423b3cb04a27f5f069b5cb02d717820adf1ac233d1918b3/container-bin-image' "${dest}/deps/"
+test -d '/versions/container-bin-image.5a9795319106b456254c88c3fc59b451fc70ff03481d37211dd1a6c0be0da711/container-bin-image'
+test -f '/versions/container-bin-image.5a9795319106b456254c88c3fc59b451fc70ff03481d37211dd1a6c0be0da711/container-bin-image/if'
+ln -sf '/versions/container-bin-image.5a9795319106b456254c88c3fc59b451fc70ff03481d37211dd1a6c0be0da711/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.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-dosfstools.85c86ff0d269d53af70def72a9adddca737d70096043e3720792b02a4f4e25e3
-#+busybox-e2fsprogs.63818428105760e9b1bafb5cc765e3f1e2939ec127a4b08d957df9cde2599466
-#+busybox-iproute2.54ccee32719b2c0bb9f3d6cbd8dfd4c09062bb681af18e3ed994cca45fd330bd
-#+busybox-iputils.64b19952b26879cdbfdd32257e2f486f7d2e8b52f719fa7ec10c8b41552bc9c8
-#+busybox-net-misc.61dc15f76bf37642e30ed621e47337af0eb5719e6ccca24416e3fa979843713f
-#+busybox-net-tools.918e7f0dfb89e5df9c809eef8c061dd19fd4b2ab75625829e7640e44ec5c9463
-#+busybox-traceroute.90e9e1797ab14371f20ebc76a2fff0ba875faceb0f4359c2f4e5ef55df75bb34
-#+busybox-wget.729dd834ffdba7ad76dd914b2dd5352ce58130a0f6b17ccef1097c9dce3d33ad
-#+busybox-chpst.f90fe836f75107df9aff6142c549709370f688fec811797cd72d2b2a01c671a0
-#+busybox-console.d191b9c51818690757189fc5c98999183d51283be01e9446da1554425d025a93
-#+busybox-getty.1a0dfbe78dc9e417c1cdc9773f885d5f05d61535b3f58a3bb8d1b3711fb9a849
-#+busybox-i2c-tools.bd159e2598756b7065567411d22cde9cc72329765d1a32da6a0956442502b403
-#+busybox-linux-extra.57e2dcccfb6b1e2393f5a1dacc6b1dfc71f3c1a9e6dd0fe56b421ff225c17b94
-#+busybox-mtd-utils.664f71e3e7cb1ea13912476516b826db27a0392de13c060685c0f29c49f862ab
-#+busybox-shadow.76d726bbb8df5d6ee42c0f32cd280a91eb94f0949dba7421487dbe4583c90d3a
-#+busybox-su.87c2dfbabec12790378c5feeaab4012a3b98f08ac16fa30c6a064f971c75436b
-#+busybox-util-linux-priv.88f0e5c221f24105bbee2a6e84fcd72481dd39702b0b633b733e81a4b4598ed7
-#+busybox-logging.97c5602ed84ffb239611645e58d0c97a07b505fcefabed885e4f8410e8b282cf
-#+busybox-cron.3afe963ad428f47f2b53382cc62b40f7f168b41d1468061cc5a56a5ecf60d2c7
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+execline.62309d4bece25d9fd9801a7e9e9e4a97e5a26cc6d8b6ec40f2420ecf0e22a677
-#+s6.e97bd84122cca75a7b68f68889496be7a5609e4a94bfa4a337e2787dcd79fc15
-#+s6-portable-utils.e01a0123c3b6487da8c18c31e7f53ac122bfcde8fccf4b18218793e02fba41ab
-#+s6-linux-utils.6c4ea4899b9c7e63442a17bd44e9521c5d423e715efb22b7ff5e0754a19c9c66
-#+zsh.786b35599b47e5a64e8f64b6853fed96325776545db70e7c5d41d519337e8668
-#+confz.020fb08d03a60480ec91080a1433480c88e3da8537eaa57fcc7ab04baf5e9679
-#+containers.9e504637d1f39ca2b432092d6120738fe9a08e5c6c84cc96dc24c4111a291bd8
-#+xbps.94dbf6e35bf4caf6110fd17386ece2641d49a8c016466c673ce34847c992f030
-#+zstd.78d52b3e7f0cfe343a81f7e5932a4469e0ec04d33e415fae0fd5821f099f89ca
-#+apk-tools.d7f8ada88ff253d290bcc916be4269b525f2de37bbdde9a30718c364906c3a56
-#+alpine-keys.8cfb93325d6f962b6c307cce2f89c4684aca7add2d976625ff8ecfad2260e76b
-#+getent.9a5b335a1ae21ec669fb582dfa25a49f824113c551e5ab83f4f1d8b86e335ce4
-#+fileset.755f29f3bc7b362e009c824de42787e53900e7d617163071e9e65568bb507090
-#+ccx-utils.cd8e6ae95f0aecc4d3e2d82b89cf18e514d4d8ebd4d6e1692f70b6cae4fee221
-#+easyseccomp.7039e9df60d515ae930afb80a1ad0bc473a023fbfefb6d9823c8634c69e1c081
-#+findutils.9235c0f4d478927839f78a113dbf379c4ee779fa882679546aeac6cc109a8fa8
-#+nawk.9ffe9e8ced505282f9526814564a6fbd53b46a34c3c533cdbeb35679a5986805-
\ No newline at end of file
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-dosfstools.52bc4ff96892385af5010d7eb2c7b81bd82a92ab8dae9ea9442a1e3907cd2356
+#+busybox-e2fsprogs.4da2840b28884a7ff7eff7d9166e3527b4dfb67a463307259875be056315cdd2
+#+busybox-iproute2.5c4a71bc1015c624bee6630b1d5bb1f0f4b9b5188434d241bd45e9824ca900dc
+#+busybox-iputils.b7cddd6f32d789bbbda1d7debdfa9503d4900bd75f45ab5ed5cc33ccbcaf8d75
+#+busybox-net-misc.856cd9fbdccba7e9270791cbb8f81d16a4b785f2a0a9097619a7c074ea1a7448
+#+busybox-net-tools.c4e96b330fc28c88140911e96462a931fda1ed30165e205b5afa71d86f572392
+#+busybox-traceroute.0599ec936adfdc56c68c19cca030a61efcdddba960b35728c846a0a68467399a
+#+busybox-wget.a0994072aab7d10e281293d288981ef31db5ea77015b6b6b7067fbb0f6d9b6e0
+#+busybox-chpst.35150e3653a1a85065d295d1fd896dd335286b199fdabbabc446b5a50b09f891
+#+busybox-console.9f778c9f338b33f978d8bb48c931f62f2710421ba46e53d08de7e9ae42151162
+#+busybox-getty.5135eca5f521d03c7ba7b4ada57cefdf08c8c3d9a8675895dd2c4037fdd7decf
+#+busybox-i2c-tools.44579eb7f7b4c2c95c69bcc2d8ca205396f86ba12b165852c2b3ed7a3265c6cb
+#+busybox-linux-extra.1f0f5dac6a84f72fa1aa9eb8180743900c431184f578d6a96e3a4c1b665b9f76
+#+busybox-mtd-utils.22f838bd0436ffdfab9749eb2b46b9099fca29651c2e00d0d444aa3e96b72d7b
+#+busybox-shadow.cc8ca5cbc3645e6b024fb0c21ea2b4dc6550796c7e6042ddfd165d42c42623f6
+#+busybox-su.05e8fb55f2e28680baa38aaca217d1e2bd5d0bde513946d919046438121b0512
+#+busybox-util-linux-priv.0267a11624ca9ed5364e0bcf9bbd79769157f3e7e06c1bcba398ce18f20f7e68
+#+busybox-logging.0242130f83cfcc7cd9a18b887b68e875da070e849b7290c19abea7872db21806
+#+busybox-cron.6b6765827e1dc2d52c5c77f024483201b6d381551fd46d6f98406ab3a5c069c2
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+execline.5597cefe7a3464a1a03ef20a49a1aefb98ada3e016a0c3331ad0023ad8647ec3
+#+s6.2fcd8917da46cad0ccaa860ae3f5516dc321f0534f674d390ae62b9c931c67ee
+#+s6-portable-utils.e7a2584cb9a381e58999865bafb19a4f8cbb6e6c58dd07c6ee9ffa53e5f8e93c
+#+s6-linux-utils.2648518f85fa0e88741fde973899a3d4fb5f1d25950f46137badf9ddb861aac7
+#+zsh.52c232b069e8cfa3d25529f8680f9b793eb9ecbd805f5f44942c61089e0934a7
+#+confz.cc0c72630acd10cf47efbcb65d6a4be651deaef96771f48d10d08971ae433fe4
+#+containers.ba73dc9d30968138a18779b19cb56427d25c72b7d879b8aff2979c38abae8a1f
+#+xbps.4d1bcc0f5d86a23cc8d4fe9c92793156d8e240bdd59286fe2d9b855c90094be2
+#+zstd.4d0316139a860ab98a38660f734fae196cacdc04bf56f4d45b0a692d06473fe1
+#+apk-tools.e09162294416fd3f716bfad8a2a6c091bb55d6a3e7f9d9ceb98bb383ed08a49f
+#+alpine-keys.eb90bd515fa5d5f3d8ae764cd1e9a936e0cefb029d00ccd7141dcbbe8bda05c8
+#+getent.65cede614db90b83bc90264b4161c6bf1d11df1b708353ea70d783131d45c679
+#+fileset.0232f2d41438ab2851bf62f624b72a7f2edb82a5a7cd0b02e3b979210f6c457a
+#+ccx-utils.8f56efdd62d14d99fc9afc488e3a725b5fd4e81fd67150277c38c8a069bbf347
+#+easyseccomp.2f42156b0846de477488d9dc7e4523868a156e0792889226991c892a4da499c6
+#+findutils.3f04076afac7f1f2c5b31951e67a444d1629d9dc6b59bc45406679a23636d16a
+#+nawk.a45f17510ace9517b9d7c542d513276f0f6ac6b18fa795e3ece69be76dfdcdaa+
\ No newline at end of file
diff --git a/variants/root-x86_64/curl b/variants/root-x86_64/curl
@@ -1,39 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+m4.a52b544a61e3d3890392553a1c63a5c3ee7a4c4c5d0c7685ebfb9f828a3ef2bf
-#+libressl.6946b4de4f6a6da96980a9b0e95157a75850c4bf9a93c761c8d6f9ab918c6e7e
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+m4.4883a41081b9cdff29d76e24ccadd5dea8897716f9e5b20789d7489c2db62170
+#+libressl.737550246c5f7966d58e66007cd0328a5a10af72c47b86189c7bd24d02903b40
 #@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:.
 
 
diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment
@@ -1,99 +1,97 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-dosfstools.85c86ff0d269d53af70def72a9adddca737d70096043e3720792b02a4f4e25e3
-#+busybox-e2fsprogs.63818428105760e9b1bafb5cc765e3f1e2939ec127a4b08d957df9cde2599466
-#+busybox-iproute2.54ccee32719b2c0bb9f3d6cbd8dfd4c09062bb681af18e3ed994cca45fd330bd
-#+busybox-iputils.64b19952b26879cdbfdd32257e2f486f7d2e8b52f719fa7ec10c8b41552bc9c8
-#+busybox-net-misc.61dc15f76bf37642e30ed621e47337af0eb5719e6ccca24416e3fa979843713f
-#+busybox-net-tools.918e7f0dfb89e5df9c809eef8c061dd19fd4b2ab75625829e7640e44ec5c9463
-#+busybox-traceroute.90e9e1797ab14371f20ebc76a2fff0ba875faceb0f4359c2f4e5ef55df75bb34
-#+busybox-wget.729dd834ffdba7ad76dd914b2dd5352ce58130a0f6b17ccef1097c9dce3d33ad
-#+busybox-chpst.f90fe836f75107df9aff6142c549709370f688fec811797cd72d2b2a01c671a0
-#+busybox-console.d191b9c51818690757189fc5c98999183d51283be01e9446da1554425d025a93
-#+busybox-getty.1a0dfbe78dc9e417c1cdc9773f885d5f05d61535b3f58a3bb8d1b3711fb9a849
-#+busybox-i2c-tools.bd159e2598756b7065567411d22cde9cc72329765d1a32da6a0956442502b403
-#+busybox-linux-extra.57e2dcccfb6b1e2393f5a1dacc6b1dfc71f3c1a9e6dd0fe56b421ff225c17b94
-#+busybox-mtd-utils.664f71e3e7cb1ea13912476516b826db27a0392de13c060685c0f29c49f862ab
-#+busybox-shadow.76d726bbb8df5d6ee42c0f32cd280a91eb94f0949dba7421487dbe4583c90d3a
-#+busybox-su.87c2dfbabec12790378c5feeaab4012a3b98f08ac16fa30c6a064f971c75436b
-#+busybox-util-linux-priv.88f0e5c221f24105bbee2a6e84fcd72481dd39702b0b633b733e81a4b4598ed7
-#+busybox-logging.97c5602ed84ffb239611645e58d0c97a07b505fcefabed885e4f8410e8b282cf
-#+busybox-cron.3afe963ad428f47f2b53382cc62b40f7f168b41d1468061cc5a56a5ecf60d2c7
-#+attr.2deab0952c63f4215a9b269dce5c662474dcfbfeed26983137e2b7d7aa9220b2
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+diffutils.d9f34e8ddf24f4144bb974b8cf3ec0d25454280089f1a6cc514034e19c53ce57
-#+patch.f96ad537c882a1bed9479ea978ccc31fbcbee68a1d18a5deb9003258bc58f2ce
-#+flex.e03fc54a9d85f6ca301fd813c1b12ca06cef79c60017ed22db3902e7fa893ff8
-#+bison.133fba3a15fd4cc629aff5dd08c291d476bb7d2ff91b8aeff1b5012cf95709f2
-#+rsync.a347262d08f314b1669571238a2ce5f1a9863a97936ef2478e418942e81d012a
-#+execline.62309d4bece25d9fd9801a7e9e9e4a97e5a26cc6d8b6ec40f2420ecf0e22a677
-#+s6.e97bd84122cca75a7b68f68889496be7a5609e4a94bfa4a337e2787dcd79fc15
-#+s6-rc.b8f2a714b1156e4c56c34e3f901f9fe2085d985ba11d47fa019367544a199fb3
-#+s6-portable-utils.e01a0123c3b6487da8c18c31e7f53ac122bfcde8fccf4b18218793e02fba41ab
-#+s6-linux-utils.6c4ea4899b9c7e63442a17bd44e9521c5d423e715efb22b7ff5e0754a19c9c66
-#+s6-linux-init.aaf6b740df984be99b0ce273af5d27a00f70a13ee0405d43c2779a453dd9f51c
-#+mdevd.6e9888891f75ceebc5a17f6470f3364305c60a4494d0293868155a1041553413
-#+s6-dns.89aa6accc46063e7b805e01921a5e0c65f2030b1a8046587e8eb033ceb4b9eef
-#+libressl.6946b4de4f6a6da96980a9b0e95157a75850c4bf9a93c761c8d6f9ab918c6e7e
-#+s6-networking.e551ae60e43726449e33cdf44ff1ddf90f770bc23ba93fd5b5c847aed64ef889
-#+zsh.786b35599b47e5a64e8f64b6853fed96325776545db70e7c5d41d519337e8668
-#+pthbs-banginstall.e0b92a53563e59c27563cff50c09e7fe23b02ec2b5114f78c7e6cb4902467c48
-#+aat.a1d2074aa8ce75d0752dd5f6e5b1a9023aa29187ea026bfd2fd6f0dc859ead42
-#+confz.020fb08d03a60480ec91080a1433480c88e3da8537eaa57fcc7ab04baf5e9679
-#+containers.9e504637d1f39ca2b432092d6120738fe9a08e5c6c84cc96dc24c4111a291bd8
-#+fileset.755f29f3bc7b362e009c824de42787e53900e7d617163071e9e65568bb507090
-#+logincaps.9609c33a49f14ae8d8d4074fb0918cc8dcc810bb9d6b3eede2ac10cff52a6ea5
-#+snaprep.a8e75c05cf4d610b3cf978089ddabcfe976fc4c95cff56c43d1f460956d6d96d
-#+curl.d3701eb9de92c5486eb085f578e2307e88b00e277fbc12935c7c9a1ff433d5cd
-#+git.99223693863044d4838256f73a937e5754d1fd85031e9bd9fcfd7ca17a200095
-#+xbps.94dbf6e35bf4caf6110fd17386ece2641d49a8c016466c673ce34847c992f030
-#+apk-tools.d7f8ada88ff253d290bcc916be4269b525f2de37bbdde9a30718c364906c3a56
-#+getent.9a5b335a1ae21ec669fb582dfa25a49f824113c551e5ab83f4f1d8b86e335ce4
-#+getconf.0fcd3838a99034e1880560e0bc83f9440df26b175b9c7182cd73cdaf454d229a
-#+iconv.319b9685b72ca6d1af9b6a6d2445146fc117f08acb05801a020618f36ecb8098
-#+libcap.c34b2ea3e798da1b9e2ed6048cbcdbe14de0e34dfe4dddfceb45eeefecbce285
-#+applyuidgid-caps.dfc0c85465799451d6cd64d8fd6a2911b6d010e7a9475e8ee9f1bb37ba4f9051
-#+ccx-utils.cd8e6ae95f0aecc4d3e2d82b89cf18e514d4d8ebd4d6e1692f70b6cae4fee221
-#+user-env.18be8d2cdc61e13707392fc452e4ede5687a91266c37096bf6a84eeaeb391e86
-#+strace.a6c459c53cf0453efb4f7bc62506b49b74c46f4e049f4ce1a6130acb27bd0a93
-#+mlog.23609677a49ced82691b8340351b9328014ab148672875ed8de0af015732f619
-#+findutils.9235c0f4d478927839f78a113dbf379c4ee779fa882679546aeac6cc109a8fa8
-#+nawk.9ffe9e8ced505282f9526814564a6fbd53b46a34c3c533cdbeb35679a5986805
-#+nvi.34ce75ce7c637e538ca4394f5801840de8cca91252a09935ff4fc2eeca822cd6
-#+squashfs-tools.931592b774aacabdab04458258ea46a5390d716be84d2071781e8536a9b838f2
-#+mandoc.07ef5e99caa7867a95017c1ebeaf18cdb9a636488f377aea2f80b843e39c9eeb
-#+tinyssh.47f85a264ef96d7f4601671ba75f3aeee6e6067df54e1ce729e03d73ef921c98
-#+system-config.64665518b92ed155e1d46edf164b50a6b83bc2e733ad4a7667df67ac94474ee3
-#+system-config-rc.f568d4697c8904b8f280e02b0796611a6ad10eeb9991302b8dda8af6768f9802
-#+system-config-scripts.635785445cc9d3cb3fc139e4c4a43ee26c441e85e71dddc01d902827eada5325
-#+system-config-init.46a3ec599c684e78721250dd11777db877d733baa07c876ac7690a59548eec7d
-#+system-config-zsh.bef1213b5cd852ac4e776e267ecb1fef54a0995bed2f7b6182d001725b44c60b
-#+busybox-modutils.5083238d2449af949077a8e52c580a887fe1b91c8d10dfc7ef85bea2da6cd77e-
\ No newline at end of file
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-dosfstools.52bc4ff96892385af5010d7eb2c7b81bd82a92ab8dae9ea9442a1e3907cd2356
+#+busybox-e2fsprogs.4da2840b28884a7ff7eff7d9166e3527b4dfb67a463307259875be056315cdd2
+#+busybox-iproute2.5c4a71bc1015c624bee6630b1d5bb1f0f4b9b5188434d241bd45e9824ca900dc
+#+busybox-iputils.b7cddd6f32d789bbbda1d7debdfa9503d4900bd75f45ab5ed5cc33ccbcaf8d75
+#+busybox-net-misc.856cd9fbdccba7e9270791cbb8f81d16a4b785f2a0a9097619a7c074ea1a7448
+#+busybox-net-tools.c4e96b330fc28c88140911e96462a931fda1ed30165e205b5afa71d86f572392
+#+busybox-traceroute.0599ec936adfdc56c68c19cca030a61efcdddba960b35728c846a0a68467399a
+#+busybox-wget.a0994072aab7d10e281293d288981ef31db5ea77015b6b6b7067fbb0f6d9b6e0
+#+busybox-chpst.35150e3653a1a85065d295d1fd896dd335286b199fdabbabc446b5a50b09f891
+#+busybox-console.9f778c9f338b33f978d8bb48c931f62f2710421ba46e53d08de7e9ae42151162
+#+busybox-getty.5135eca5f521d03c7ba7b4ada57cefdf08c8c3d9a8675895dd2c4037fdd7decf
+#+busybox-i2c-tools.44579eb7f7b4c2c95c69bcc2d8ca205396f86ba12b165852c2b3ed7a3265c6cb
+#+busybox-linux-extra.1f0f5dac6a84f72fa1aa9eb8180743900c431184f578d6a96e3a4c1b665b9f76
+#+busybox-mtd-utils.22f838bd0436ffdfab9749eb2b46b9099fca29651c2e00d0d444aa3e96b72d7b
+#+busybox-shadow.cc8ca5cbc3645e6b024fb0c21ea2b4dc6550796c7e6042ddfd165d42c42623f6
+#+busybox-su.05e8fb55f2e28680baa38aaca217d1e2bd5d0bde513946d919046438121b0512
+#+busybox-util-linux-priv.0267a11624ca9ed5364e0bcf9bbd79769157f3e7e06c1bcba398ce18f20f7e68
+#+busybox-logging.0242130f83cfcc7cd9a18b887b68e875da070e849b7290c19abea7872db21806
+#+busybox-cron.6b6765827e1dc2d52c5c77f024483201b6d381551fd46d6f98406ab3a5c069c2
+#+attr.9aeb8c9aa9b0c58d0bef1fbf3dbbd7edf415f351c5f2aea11e1a0b2cebc70274
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+diffutils.ce1debc080204cf007a72b5cf9cd4f903c3f4f09fd33bf147d5e6ea407f7c1dc
+#+patch.a7f1a33763eeb4c7728022e5cf4f69c537c12ee97b8de5b76610f2fde144fa84
+#+flex.fc0768f60cfea619079286fc2694c1d39541706719fc9aad705a3ef92a4ceea1
+#+bison.7245d2c57021d0f0600acc2ead962c6af431328919c6f4a8edcab37e827e004b
+#+rsync.8c159221c3679d50ecb1a7b9c04ea359be996d8782e37c52004d053ee48a3e91
+#+execline.5597cefe7a3464a1a03ef20a49a1aefb98ada3e016a0c3331ad0023ad8647ec3
+#+s6.2fcd8917da46cad0ccaa860ae3f5516dc321f0534f674d390ae62b9c931c67ee
+#+s6-rc.513e5770c2928ca6ad42de54c31da20cf2ec018e1ea9d47df55b4b48ec0d8849
+#+s6-portable-utils.e7a2584cb9a381e58999865bafb19a4f8cbb6e6c58dd07c6ee9ffa53e5f8e93c
+#+s6-linux-utils.2648518f85fa0e88741fde973899a3d4fb5f1d25950f46137badf9ddb861aac7
+#+s6-linux-init.9948aac6370c28e4ee27147483d55c130be50baf961501391f24bffdfe120c13
+#+mdevd.2db7c0c0c9e423e6ff623230e5914f773cc34218128f7fb18e692bea0705c741
+#+s6-dns.2b4ed643da7bc8ac9b8e8b54524e6ae119654c1556c6a50b46563bfa2895ec70
+#+libressl.737550246c5f7966d58e66007cd0328a5a10af72c47b86189c7bd24d02903b40
+#+s6-networking.7d74f36ef79b1ba8772429fdc2f05609301fe5c26ad5e157163adbb2f06ca5b9
+#+zsh.52c232b069e8cfa3d25529f8680f9b793eb9ecbd805f5f44942c61089e0934a7
+#+pthbs-banginstall.11a4dfa7bbf19f57643e1f71dae30a17ee21b42960bf46b4328cc685c50d8204
+#+aat.b9870a3abed53ba497de03071a0a5143c3358612984bb4e7e844d180aebdd916
+#+confz.cc0c72630acd10cf47efbcb65d6a4be651deaef96771f48d10d08971ae433fe4
+#+containers.ba73dc9d30968138a18779b19cb56427d25c72b7d879b8aff2979c38abae8a1f
+#+fileset.0232f2d41438ab2851bf62f624b72a7f2edb82a5a7cd0b02e3b979210f6c457a
+#+logincaps.1b9a07e5a09d733c71f0891700b95a1e25125ed7ae2e32e23d8bf50fbfb6a000
+#+snaprep.696eae96ddfe992c87aa062c577e02fdf275cb8ecc549f9f3793bb549236ba79
+#+curl.35f09b46cfdbad1dd1e1ec3fdbdc0fce661c4e709181686aa3969f9174c9ba4b
+#+git.54bab6cebd0b9033b19043f937a96f4752f9f9cac0d37d0d59de7a3b4999f75e
+#+xbps.4d1bcc0f5d86a23cc8d4fe9c92793156d8e240bdd59286fe2d9b855c90094be2
+#+apk-tools.e09162294416fd3f716bfad8a2a6c091bb55d6a3e7f9d9ceb98bb383ed08a49f
+#+getent.65cede614db90b83bc90264b4161c6bf1d11df1b708353ea70d783131d45c679
+#+getconf.207e54372f55843e89d07e08eaee256e35497e1f494a95aee306d6c6a38d48d7
+#+iconv.94d8c510ad7362ded029bba04b761d18d101789ec61753b2c3ccc921989d9bdc
+#+libcap.b1ee55e09f1c9a2ed427132f4248421b06264f0c08cf48f042bf87eba98ba842
+#+applyuidgid-caps.6da83209122a58787cec038960dd8f2a41ec7b5a407f8371d7634d8d2085c2a0
+#+ccx-utils.8f56efdd62d14d99fc9afc488e3a725b5fd4e81fd67150277c38c8a069bbf347
+#+user-env.af87eebd39c23dd0d7dd423b558e9ddc4f027f1931250376c19fa1239f563cbc
+#+strace.9ec530dfc82a0ec34ce6cd04983a689e90c3308b402094608954100125454f28
+#+mlog.fc2b33e682d61377e02d4ddfb1623771daa954eb96e0f8ff4a78a0d8006e3016
+#+findutils.3f04076afac7f1f2c5b31951e67a444d1629d9dc6b59bc45406679a23636d16a
+#+nawk.a45f17510ace9517b9d7c542d513276f0f6ac6b18fa795e3ece69be76dfdcdaa
+#+nvi.4c9579da773dab1d52dbba592fbe1de56a8f630b207b8ff07105018d27dd9c44
+#+squashfs-tools.41179ea9c20d9d9e4b1cf60014cb2d44e869cfb0dafd79ae6607ced295b80d99
+#+mandoc.51b3164f88a448135fe40c80cfc23147866e79e84768b99b8a6195cd04194183
+#+tinyssh.9b9d047cdccafa68cc0d24e3b07731694cf16e50d5d6021e7d0cedc8dafa7635
+#+system-config.831ca9e7a3082e49303a89d56383fbe668c4c404aa5097e34b38e5341cfb86b8
+#+system-config-rc.dc1da4135d49e17367d9e0a192a8925f57cba106e809f4940beb06cfd4ee23f6
+#+system-config-scripts.4ffa04f1e3653486b569f45b057d3904af2397941838d9e690bb4faa381c9f83
+#+system-config-init.963d1111e73482ff9581414bbf035109006b3da092bb5ba17d489d450ee80ed4
+#+system-config-zsh.97f926f32b3d6ca93f4bd179b39a39bc3015b3b4787d6acaabc3809e005c3d5f
+#+busybox-modutils.973ad2f4884070b6954640f7db4760a11fe2af81ea77addbb6e6998817e7907c+
\ No newline at end of file
diff --git a/variants/root-x86_64/diffutils b/variants/root-x86_64/diffutils
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+m4.a52b544a61e3d3890392553a1c63a5c3ee7a4c4c5d0c7685ebfb9f828a3ef2bf
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+m4.4883a41081b9cdff29d76e24ccadd5dea8897716f9e5b20789d7489c2db62170
 #@untar:-J:sha256:90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e:.
 
 
diff --git a/variants/root-x86_64/dune b/variants/root-x86_64/dune
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.c1a193ddfa95033987ddee0659448ca47bb04b763f1365501b641bf9f6982cfd
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+ocaml.4e147f44197963e62779246c71fb0f693dd4630999cd5c54fafa295988bfcdd0
 #@untar:-z:sha256:579c738f8ca191ba0a9b22dbe78f1377542442c9827cf4939f8964f09f9edb28:.
 
 
diff --git a/variants/root-x86_64/easyseccomp b/variants/root-x86_64/easyseccomp
@@ -1,44 +1,42 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+m4.a52b544a61e3d3890392553a1c63a5c3ee7a4c4c5d0c7685ebfb9f828a3ef2bf
-#+patch.f96ad537c882a1bed9479ea978ccc31fbcbee68a1d18a5deb9003258bc58f2ce
-#+flex.e03fc54a9d85f6ca301fd813c1b12ca06cef79c60017ed22db3902e7fa893ff8
-#+bison.133fba3a15fd4cc629aff5dd08c291d476bb7d2ff91b8aeff1b5012cf95709f2
-#+libseccomp.0c1a150556dd76cdf5f879bd6ca49c2357ff67e86ada84f96be38c9b147206f5
-#+error-standalone.89c08a0adf3b56e1526f78fafd989506d8fa09ffbcbb7b30b553db5ac15bce1d
-#+argp-standalone.0e0d5d0646fc4cfb686574148d863a0a85fadf1888cdc2a1c4e2d4527f11eba3
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+m4.4883a41081b9cdff29d76e24ccadd5dea8897716f9e5b20789d7489c2db62170
+#+patch.a7f1a33763eeb4c7728022e5cf4f69c537c12ee97b8de5b76610f2fde144fa84
+#+flex.fc0768f60cfea619079286fc2694c1d39541706719fc9aad705a3ef92a4ceea1
+#+bison.7245d2c57021d0f0600acc2ead962c6af431328919c6f4a8edcab37e827e004b
+#+libseccomp.bf9ba1a5da3a3cb60b63789c55ad359b2b0a7c590227f2054793c5645e9bc64a
+#+error-standalone.87c5d825c2896919c8a1d4599998a1c6f57987a8bd4cc89336f154e2564d7b3a
+#+argp-standalone.7b44089e0b13f92685c6b60b4bc4ea5e5d90697c01144b079fcaf9f073389af3
 #@untar::sha256:1b44a63d415c48ac68d210951fec8d4761d3522f3d82d53182e66fabe5e2f2cd:easyseccomp
 #@sha256:eec15ac67403946e9d988d485f11764cf313b4798efe01d40f951ff521a23d10:easyseccomp_fix_includes.patch
 #@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp
diff --git a/variants/root-x86_64/error-standalone b/variants/root-x86_64/error-standalone
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
 #@untar:-z:sha256:0e751989cea94e25d5166a6a1ed9bde218786e39dff82e1f01dff12fc78639d9:.
 
 
diff --git a/variants/root-x86_64/execline b/variants/root-x86_64/execline
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+skalibs.a27479ee71afba38615e09103dbe1e5559e6ef9c756c5deb8217626dbe0a84ed
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+skalibs.d52c18eb24868694a2361276e9de0be604913ee74428ea7a2eb5bd9cb9349b14
 #@git:6c0957eb5e8eea2ffada4d7be08286f0e81d0527:execline
 
 
@@ -48,7 +46,7 @@ cd 'execline'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.a27479ee71afba38615e09103dbe1e5559e6ef9c756c5deb8217626dbe0a84ed/sysdeps' \
+	--with-sysdeps='/versions/skalibs.d52c18eb24868694a2361276e9de0be604913ee74428ea7a2eb5bd9cb9349b14/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.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+zsh.786b35599b47e5a64e8f64b6853fed96325776545db70e7c5d41d519337e8668
-#+pthbs-banginstall.e0b92a53563e59c27563cff50c09e7fe23b02ec2b5114f78c7e6cb4902467c48
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+zsh.52c232b069e8cfa3d25529f8680f9b793eb9ecbd805f5f44942c61089e0934a7
+#+pthbs-banginstall.11a4dfa7bbf19f57643e1f71dae30a17ee21b42960bf46b4328cc685c50d8204
 #@git:1b161b09bc889d17ac0a4ccce2dc3e74b64e1433:fileset
 
 
diff --git a/variants/root-x86_64/findutils b/variants/root-x86_64/findutils
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+m4.a52b544a61e3d3890392553a1c63a5c3ee7a4c4c5d0c7685ebfb9f828a3ef2bf
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+m4.4883a41081b9cdff29d76e24ccadd5dea8897716f9e5b20789d7489c2db62170
 #@untar:-J:sha256:1387e0b67ff247d2abde998f90dfbf70c1491391a59ddfecb8ae698789f0a4f5:.
 
 
diff --git a/variants/root-x86_64/flex b/variants/root-x86_64/flex
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+m4.a52b544a61e3d3890392553a1c63a5c3ee7a4c4c5d0c7685ebfb9f828a3ef2bf
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+m4.4883a41081b9cdff29d76e24ccadd5dea8897716f9e5b20789d7489c2db62170
 #@untar:-z:sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995:.
 
 
diff --git a/variants/root-x86_64/gcc b/variants/root-x86_64/gcc
@@ -72,6 +72,7 @@ build_env_static
 	--enable-initfini-array \
 	--enable-libstdcxx-time=rt \
 	--with-native-system-header-dir="$musl/include" \
+	--with-build-time-tools="$pthbs_build_environment/command" \
 	CFLAGS="-std=gnu17 -g0 -O2 -static --static" \
 	CXXFLAGS="-std=gnu++11 -g0 -O2 -static --static" \
 	FFLAGS="-g0 -O2" \
diff --git a/variants/root-x86_64/getconf b/variants/root-x86_64/getconf
@@ -1,35 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
 #@sha256:d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae50e320aad247c:getconf.c
 
 
diff --git a/variants/root-x86_64/getent b/variants/root-x86_64/getent
@@ -1,35 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
 #@sha256:002c1a216f6bed0f816ab1cfebde94a0b127193ef410c36b2190599983e015b8:getent.c
 
 
diff --git a/variants/root-x86_64/git b/variants/root-x86_64/git
@@ -1,40 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+m4.a52b544a61e3d3890392553a1c63a5c3ee7a4c4c5d0c7685ebfb9f828a3ef2bf
-#+libressl.6946b4de4f6a6da96980a9b0e95157a75850c4bf9a93c761c8d6f9ab918c6e7e
-#+curl.d3701eb9de92c5486eb085f578e2307e88b00e277fbc12935c7c9a1ff433d5cd
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+m4.4883a41081b9cdff29d76e24ccadd5dea8897716f9e5b20789d7489c2db62170
+#+libressl.737550246c5f7966d58e66007cd0328a5a10af72c47b86189c7bd24d02903b40
+#+curl.35f09b46cfdbad1dd1e1ec3fdbdc0fce661c4e709181686aa3969f9174c9ba4b
 #@untar:-J:sha256:f612c1abc63557d50ad3849863fc9109670139fc9901e574460ec76e0511adb9:.
 
 
diff --git a/variants/root-x86_64/gnu-make b/variants/root-x86_64/gnu-make
@@ -1,7 +1,5 @@
 #!/usr/bin/env pthbs-build
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
 #+gnu-make.e4a639067dbdc87f724a0af3861ce3ec1fc8d2ad5046d28f7e687b5ac6e9cc7e
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
diff --git a/variants/root-x86_64/gperf b/variants/root-x86_64/gperf
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+m4.a52b544a61e3d3890392553a1c63a5c3ee7a4c4c5d0c7685ebfb9f828a3ef2bf
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+m4.4883a41081b9cdff29d76e24ccadd5dea8897716f9e5b20789d7489c2db62170
 #@untar:-z:sha256:588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2:.
 
 
diff --git a/variants/root-x86_64/iconv b/variants/root-x86_64/iconv
@@ -1,35 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
 #@sha256:f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7:iconv.c
 
 
diff --git a/variants/root-x86_64/kbd b/variants/root-x86_64/kbd
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+m4.a52b544a61e3d3890392553a1c63a5c3ee7a4c4c5d0c7685ebfb9f828a3ef2bf
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+m4.4883a41081b9cdff29d76e24ccadd5dea8897716f9e5b20789d7489c2db62170
 #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:.
 #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:.
 
diff --git a/variants/root-x86_64/libarchive b/variants/root-x86_64/libarchive
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+m4.a52b544a61e3d3890392553a1c63a5c3ee7a4c4c5d0c7685ebfb9f828a3ef2bf
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+m4.4883a41081b9cdff29d76e24ccadd5dea8897716f9e5b20789d7489c2db62170
 #@untar:-J:sha256:04357661e6717b6941682cde02ad741ae4819c67a260593dfb2431861b251acb:.
 
 
diff --git a/variants/root-x86_64/libbsd b/variants/root-x86_64/libbsd
@@ -1,39 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+m4.a52b544a61e3d3890392553a1c63a5c3ee7a4c4c5d0c7685ebfb9f828a3ef2bf
-#+libmd.d8fde4897945fabbc6e66647728879930d3bdf75f8de47ae1e55e9a0e4409b9c
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+m4.4883a41081b9cdff29d76e24ccadd5dea8897716f9e5b20789d7489c2db62170
+#+libmd.46a210bfdc3c62fb6137f898ccf67677ae673baa41fb6d7df5f225b6480b7c2d
 #@untar:-J:sha256:55fdfa2696fb4d55a592fa9ad14a9df897c7b0008ddb3b30c419914841f85f33:.
 
 
diff --git a/variants/root-x86_64/libcap b/variants/root-x86_64/libcap
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+pkgconf-pkg-config.b381deb533d10dae9e9a3d187ee1205dbe64391747ad636cc313962048ac103b
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+pkgconf-pkg-config.ca7cc47c4b1a0e7593e5ce1c40ebf06089a3dd467090441266545e3804dc4883
 #@untar:-J:sha256:f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb:.
 
 
diff --git a/variants/root-x86_64/libcgroup b/variants/root-x86_64/libcgroup
@@ -1,41 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+m4.a52b544a61e3d3890392553a1c63a5c3ee7a4c4c5d0c7685ebfb9f828a3ef2bf
-#+flex.e03fc54a9d85f6ca301fd813c1b12ca06cef79c60017ed22db3902e7fa893ff8
-#+bison.133fba3a15fd4cc629aff5dd08c291d476bb7d2ff91b8aeff1b5012cf95709f2
-#+musl-fts.f2b1913fe0e7539471676bfa064875c2bb8a0516682705f1b4e3e977967b76ef
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+m4.4883a41081b9cdff29d76e24ccadd5dea8897716f9e5b20789d7489c2db62170
+#+flex.fc0768f60cfea619079286fc2694c1d39541706719fc9aad705a3ef92a4ceea1
+#+bison.7245d2c57021d0f0600acc2ead962c6af431328919c6f4a8edcab37e827e004b
+#+musl-fts.afe14378413deb28a1baef910942bfa39ab9717bee16ca8622bc17b9033190df
 #@untar:-z:sha256:8d284d896fca1c981b55850e92acd3ad9648a69227c028dda7ae3402af878edd:.
 
 
diff --git a/variants/root-x86_64/libelf b/variants/root-x86_64/libelf
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+zstd.78d52b3e7f0cfe343a81f7e5932a4469e0ec04d33e415fae0fd5821f099f89ca
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+zstd.4d0316139a860ab98a38660f734fae196cacdc04bf56f4d45b0a692d06473fe1
 #@git:288355d104ff9930520c0283fe82556c6cc5c16f:libelf
 
 
diff --git a/variants/root-x86_64/libmd b/variants/root-x86_64/libmd
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+m4.a52b544a61e3d3890392553a1c63a5c3ee7a4c4c5d0c7685ebfb9f828a3ef2bf
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+m4.4883a41081b9cdff29d76e24ccadd5dea8897716f9e5b20789d7489c2db62170
 #@untar:-J:sha256:1bd6aa42275313af3141c7cf2e5b964e8b1fd488025caf2f971f43b00776b332:.
 
 
diff --git a/variants/root-x86_64/libressl b/variants/root-x86_64/libressl
@@ -1,39 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+m4.a52b544a61e3d3890392553a1c63a5c3ee7a4c4c5d0c7685ebfb9f828a3ef2bf
-#+ca-certificates-wip-donotuse.8fb006eb21f1804443a10d8f2437192f6204d48dcd00e6d2f516749b9494d369
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+m4.4883a41081b9cdff29d76e24ccadd5dea8897716f9e5b20789d7489c2db62170
+#+ca-certificates-wip-donotuse.248de808caa82dce1f8ab9ad1a06cbbe08bff26f130565674022543ee0045db3
 #@sha256:a68fedc0edd976b9f35ecfdcb252d80dc12084b1bc4e945be7dc42c437d8b540:c_rehash.c
 #@untar:-z:sha256:6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954:.
 
@@ -101,7 +99,7 @@ make DESTDIR="$pthbs_destdir" install
 
 cd ..
 gcc ./c_rehash.c -o c_rehash --static -static -I"$pthbs_destdir/$prefix/include" -L"$pthbs_destdir/$prefix/library" -lssl -lcrypto
-cp -vs '/versions/ca-certificates-wip-donotuse.8fb006eb21f1804443a10d8f2437192f6204d48dcd00e6d2f516749b9494d369/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/"
+cp -vs '/versions/ca-certificates-wip-donotuse.248de808caa82dce1f8ab9ad1a06cbbe08bff26f130565674022543ee0045db3/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/"
 ./c_rehash  "$pthbs_destdir/$prefix/config/ssl/certs/"
 cd  "$pthbs_destdir/$prefix/config/ssl/"
 mv cert.pem libressl-cert.pem
diff --git a/variants/root-x86_64/libseccomp b/variants/root-x86_64/libseccomp
@@ -1,40 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+m4.a52b544a61e3d3890392553a1c63a5c3ee7a4c4c5d0c7685ebfb9f828a3ef2bf
-#+pkgconf-pkg-config.b381deb533d10dae9e9a3d187ee1205dbe64391747ad636cc313962048ac103b
-#+gperf.97a7ae9a5cb37f90022331df0fa1d96e662a7d026c88c83a6a5440f90f085492
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+m4.4883a41081b9cdff29d76e24ccadd5dea8897716f9e5b20789d7489c2db62170
+#+pkgconf-pkg-config.ca7cc47c4b1a0e7593e5ce1c40ebf06089a3dd467090441266545e3804dc4883
+#+gperf.3e18a43d41db3925ef88f90dc975227f9c3383734ac00c1626c0ab80bc774fbe
 #@untar:-z:sha256:83b6085232d1588c379dc9b9cae47bb37407cf262e6e74993c61ba72d2a784dc:.
 
 
diff --git a/variants/root-x86_64/libunwind b/variants/root-x86_64/libunwind
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+m4.a52b544a61e3d3890392553a1c63a5c3ee7a4c4c5d0c7685ebfb9f828a3ef2bf
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+m4.4883a41081b9cdff29d76e24ccadd5dea8897716f9e5b20789d7489c2db62170
 #@untar:-z:sha256:ddf0e32dd5fafe5283198d37e4bf9decf7ba1770b6e7e006c33e6df79e6a6157:.
 
 
diff --git a/variants/root-x86_64/linux-qemu-guest b/variants/root-x86_64/linux-qemu-guest
@@ -1,46 +1,44 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nofail_digest
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-modutils.5083238d2449af949077a8e52c580a887fe1b91c8d10dfc7ef85bea2da6cd77e
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+findutils.9235c0f4d478927839f78a113dbf379c4ee779fa882679546aeac6cc109a8fa8
-#+diffutils.d9f34e8ddf24f4144bb974b8cf3ec0d25454280089f1a6cc514034e19c53ce57
-#+patch.f96ad537c882a1bed9479ea978ccc31fbcbee68a1d18a5deb9003258bc58f2ce
-#+flex.e03fc54a9d85f6ca301fd813c1b12ca06cef79c60017ed22db3902e7fa893ff8
-#+bison.133fba3a15fd4cc629aff5dd08c291d476bb7d2ff91b8aeff1b5012cf95709f2
-#+rsync.a347262d08f314b1669571238a2ce5f1a9863a97936ef2478e418942e81d012a
-#+zstd.78d52b3e7f0cfe343a81f7e5932a4469e0ec04d33e415fae0fd5821f099f89ca
-#+libelf.1a5d2e86e34d4d2b165c97653f13855c2cc0d85fe447c09b6b4573a49f19c84b
-#+pkgconf-pkg-config.b381deb533d10dae9e9a3d187ee1205dbe64391747ad636cc313962048ac103b
-#+nawk.9ffe9e8ced505282f9526814564a6fbd53b46a34c3c533cdbeb35679a5986805
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-modutils.973ad2f4884070b6954640f7db4760a11fe2af81ea77addbb6e6998817e7907c
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+findutils.3f04076afac7f1f2c5b31951e67a444d1629d9dc6b59bc45406679a23636d16a
+#+diffutils.ce1debc080204cf007a72b5cf9cd4f903c3f4f09fd33bf147d5e6ea407f7c1dc
+#+patch.a7f1a33763eeb4c7728022e5cf4f69c537c12ee97b8de5b76610f2fde144fa84
+#+flex.fc0768f60cfea619079286fc2694c1d39541706719fc9aad705a3ef92a4ceea1
+#+bison.7245d2c57021d0f0600acc2ead962c6af431328919c6f4a8edcab37e827e004b
+#+rsync.8c159221c3679d50ecb1a7b9c04ea359be996d8782e37c52004d053ee48a3e91
+#+zstd.4d0316139a860ab98a38660f734fae196cacdc04bf56f4d45b0a692d06473fe1
+#+libelf.fad9bd4382b11ac5e9ed2982f2a7c4563fee682d3c2435ef227d543206b54c1b
+#+pkgconf-pkg-config.ca7cc47c4b1a0e7593e5ce1c40ebf06089a3dd467090441266545e3804dc4883
+#+nawk.a45f17510ace9517b9d7c542d513276f0f6ac6b18fa795e3ece69be76dfdcdaa
 #@untar:-J:sha256:7586962547803be7ecc4056efc927fb25214548722bd28171172f3599abb9764:.
 #@sha256:cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867:linux.config
 #@sha256:ff3ddd131d73fee6838b11a6c4773bdb85c5f60fdd4b9ac4120ced021c341417:noobjtool.patch
diff --git a/variants/root-x86_64/logincaps b/variants/root-x86_64/logincaps
@@ -1,39 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+zsh.786b35599b47e5a64e8f64b6853fed96325776545db70e7c5d41d519337e8668
-#+pthbs-banginstall.e0b92a53563e59c27563cff50c09e7fe23b02ec2b5114f78c7e6cb4902467c48
-#+execline.62309d4bece25d9fd9801a7e9e9e4a97e5a26cc6d8b6ec40f2420ecf0e22a677
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ccx-utils.cd8e6ae95f0aecc4d3e2d82b89cf18e514d4d8ebd4d6e1692f70b6cae4fee221
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+zsh.52c232b069e8cfa3d25529f8680f9b793eb9ecbd805f5f44942c61089e0934a7
+#+pthbs-banginstall.11a4dfa7bbf19f57643e1f71dae30a17ee21b42960bf46b4328cc685c50d8204
+#+execline.5597cefe7a3464a1a03ef20a49a1aefb98ada3e016a0c3331ad0023ad8647ec3
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+ccx-utils.8f56efdd62d14d99fc9afc488e3a725b5fd4e81fd67150277c38c8a069bbf347
 #@git:409db79b3e7e5fc6b73305471d9bbb6ac5c14036:logincaps
 
 
diff --git a/variants/root-x86_64/m4 b/variants/root-x86_64/m4
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
 #@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:.
 
 
diff --git a/variants/root-x86_64/mandoc b/variants/root-x86_64/mandoc
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
 #@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.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+zsh.786b35599b47e5a64e8f64b6853fed96325776545db70e7c5d41d519337e8668
-#+pthbs-banginstall.e0b92a53563e59c27563cff50c09e7fe23b02ec2b5114f78c7e6cb4902467c48
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+zsh.52c232b069e8cfa3d25529f8680f9b793eb9ecbd805f5f44942c61089e0934a7
+#+pthbs-banginstall.11a4dfa7bbf19f57643e1f71dae30a17ee21b42960bf46b4328cc685c50d8204
 #@git:395634340de8349996fd273b055ae4bac9d2897c:mdev-scripts
 
 
diff --git a/variants/root-x86_64/mdevd b/variants/root-x86_64/mdevd
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+skalibs.a27479ee71afba38615e09103dbe1e5559e6ef9c756c5deb8217626dbe0a84ed
-#+execline.62309d4bece25d9fd9801a7e9e9e4a97e5a26cc6d8b6ec40f2420ecf0e22a677
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+skalibs.d52c18eb24868694a2361276e9de0be604913ee74428ea7a2eb5bd9cb9349b14
+#+execline.5597cefe7a3464a1a03ef20a49a1aefb98ada3e016a0c3331ad0023ad8647ec3
 #@git:96aef400b9f9d14f3bf54b0e444e9ad3665c4107:mdevd
 
 
@@ -49,7 +47,7 @@ cd 'mdevd'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.a27479ee71afba38615e09103dbe1e5559e6ef9c756c5deb8217626dbe0a84ed/sysdeps' \
+	--with-sysdeps='/versions/skalibs.d52c18eb24868694a2361276e9de0be604913ee74428ea7a2eb5bd9cb9349b14/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.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-dosfstools.85c86ff0d269d53af70def72a9adddca737d70096043e3720792b02a4f4e25e3
-#+busybox-e2fsprogs.63818428105760e9b1bafb5cc765e3f1e2939ec127a4b08d957df9cde2599466
-#+busybox-iproute2.54ccee32719b2c0bb9f3d6cbd8dfd4c09062bb681af18e3ed994cca45fd330bd
-#+busybox-iputils.64b19952b26879cdbfdd32257e2f486f7d2e8b52f719fa7ec10c8b41552bc9c8
-#+busybox-net-misc.61dc15f76bf37642e30ed621e47337af0eb5719e6ccca24416e3fa979843713f
-#+busybox-net-tools.918e7f0dfb89e5df9c809eef8c061dd19fd4b2ab75625829e7640e44ec5c9463
-#+busybox-traceroute.90e9e1797ab14371f20ebc76a2fff0ba875faceb0f4359c2f4e5ef55df75bb34
-#+busybox-wget.729dd834ffdba7ad76dd914b2dd5352ce58130a0f6b17ccef1097c9dce3d33ad
-#+busybox-chpst.f90fe836f75107df9aff6142c549709370f688fec811797cd72d2b2a01c671a0
-#+busybox-console.d191b9c51818690757189fc5c98999183d51283be01e9446da1554425d025a93
-#+busybox-getty.1a0dfbe78dc9e417c1cdc9773f885d5f05d61535b3f58a3bb8d1b3711fb9a849
-#+busybox-i2c-tools.bd159e2598756b7065567411d22cde9cc72329765d1a32da6a0956442502b403
-#+busybox-linux-extra.57e2dcccfb6b1e2393f5a1dacc6b1dfc71f3c1a9e6dd0fe56b421ff225c17b94
-#+busybox-mtd-utils.664f71e3e7cb1ea13912476516b826db27a0392de13c060685c0f29c49f862ab
-#+busybox-shadow.76d726bbb8df5d6ee42c0f32cd280a91eb94f0949dba7421487dbe4583c90d3a
-#+busybox-su.87c2dfbabec12790378c5feeaab4012a3b98f08ac16fa30c6a064f971c75436b
-#+busybox-util-linux-priv.88f0e5c221f24105bbee2a6e84fcd72481dd39702b0b633b733e81a4b4598ed7
-#+busybox-logging.97c5602ed84ffb239611645e58d0c97a07b505fcefabed885e4f8410e8b282cf
-#+busybox-cron.3afe963ad428f47f2b53382cc62b40f7f168b41d1468061cc5a56a5ecf60d2c7
-#+execline.62309d4bece25d9fd9801a7e9e9e4a97e5a26cc6d8b6ec40f2420ecf0e22a677
-#+s6.e97bd84122cca75a7b68f68889496be7a5609e4a94bfa4a337e2787dcd79fc15
-#+mdev-scripts.1ee1eb7d8767bde6d5f7f55d9f948aaeac857d2565538f433ac58b37b23927c9
-#+mdevd.6e9888891f75ceebc5a17f6470f3364305c60a4494d0293868155a1041553413
-#+busybox-modutils.5083238d2449af949077a8e52c580a887fe1b91c8d10dfc7ef85bea2da6cd77e-
\ No newline at end of file
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-dosfstools.52bc4ff96892385af5010d7eb2c7b81bd82a92ab8dae9ea9442a1e3907cd2356
+#+busybox-e2fsprogs.4da2840b28884a7ff7eff7d9166e3527b4dfb67a463307259875be056315cdd2
+#+busybox-iproute2.5c4a71bc1015c624bee6630b1d5bb1f0f4b9b5188434d241bd45e9824ca900dc
+#+busybox-iputils.b7cddd6f32d789bbbda1d7debdfa9503d4900bd75f45ab5ed5cc33ccbcaf8d75
+#+busybox-net-misc.856cd9fbdccba7e9270791cbb8f81d16a4b785f2a0a9097619a7c074ea1a7448
+#+busybox-net-tools.c4e96b330fc28c88140911e96462a931fda1ed30165e205b5afa71d86f572392
+#+busybox-traceroute.0599ec936adfdc56c68c19cca030a61efcdddba960b35728c846a0a68467399a
+#+busybox-wget.a0994072aab7d10e281293d288981ef31db5ea77015b6b6b7067fbb0f6d9b6e0
+#+busybox-chpst.35150e3653a1a85065d295d1fd896dd335286b199fdabbabc446b5a50b09f891
+#+busybox-console.9f778c9f338b33f978d8bb48c931f62f2710421ba46e53d08de7e9ae42151162
+#+busybox-getty.5135eca5f521d03c7ba7b4ada57cefdf08c8c3d9a8675895dd2c4037fdd7decf
+#+busybox-i2c-tools.44579eb7f7b4c2c95c69bcc2d8ca205396f86ba12b165852c2b3ed7a3265c6cb
+#+busybox-linux-extra.1f0f5dac6a84f72fa1aa9eb8180743900c431184f578d6a96e3a4c1b665b9f76
+#+busybox-mtd-utils.22f838bd0436ffdfab9749eb2b46b9099fca29651c2e00d0d444aa3e96b72d7b
+#+busybox-shadow.cc8ca5cbc3645e6b024fb0c21ea2b4dc6550796c7e6042ddfd165d42c42623f6
+#+busybox-su.05e8fb55f2e28680baa38aaca217d1e2bd5d0bde513946d919046438121b0512
+#+busybox-util-linux-priv.0267a11624ca9ed5364e0bcf9bbd79769157f3e7e06c1bcba398ce18f20f7e68
+#+busybox-logging.0242130f83cfcc7cd9a18b887b68e875da070e849b7290c19abea7872db21806
+#+busybox-cron.6b6765827e1dc2d52c5c77f024483201b6d381551fd46d6f98406ab3a5c069c2
+#+execline.5597cefe7a3464a1a03ef20a49a1aefb98ada3e016a0c3331ad0023ad8647ec3
+#+s6.2fcd8917da46cad0ccaa860ae3f5516dc321f0534f674d390ae62b9c931c67ee
+#+mdev-scripts.cd5a37c201357754e8ba852e7c669f709fabe44d5a388c2046833b6e3690424b
+#+mdevd.2db7c0c0c9e423e6ff623230e5914f773cc34218128f7fb18e692bea0705c741
+#+busybox-modutils.973ad2f4884070b6954640f7db4760a11fe2af81ea77addbb6e6998817e7907c+
\ No newline at end of file
diff --git a/variants/root-x86_64/mlog b/variants/root-x86_64/mlog
@@ -1,36 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
 #@git:fefc95731f1260810a3551226b73d35f3d6e9d9e:mlog
 
 
diff --git a/variants/root-x86_64/musl-fts b/variants/root-x86_64/musl-fts
@@ -1,36 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
 #@untar:-z:sha256:49ae567a96dbab22823d045ffebe0d6b14b9b799925e9ca9274d47d26ff482a6:.
 
 
diff --git a/variants/root-x86_64/nawk b/variants/root-x86_64/nawk
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+bison.133fba3a15fd4cc629aff5dd08c291d476bb7d2ff91b8aeff1b5012cf95709f2
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+bison.7245d2c57021d0f0600acc2ead962c6af431328919c6f4a8edcab37e827e004b
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
 #@untar:-z:sha256:e031b1e1d2b230f276f975bffb923f0ea15f798c839d15a3f26a1a39448e32d7:.
 
 
diff --git a/variants/root-x86_64/netbsd-curses b/variants/root-x86_64/netbsd-curses
@@ -1,36 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
 #@git:51d179dad861640caeb76674b5908ccd79f04fae:netbsd-curses
 
 
diff --git a/variants/root-x86_64/nvi b/variants/root-x86_64/nvi
@@ -1,39 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+m4.a52b544a61e3d3890392553a1c63a5c3ee7a4c4c5d0c7685ebfb9f828a3ef2bf
-#+netbsd-curses.13fe55dba92600b0b78807aede98bb38e2260ff6d1bcad927a7e403175db9bf6
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+m4.4883a41081b9cdff29d76e24ccadd5dea8897716f9e5b20789d7489c2db62170
+#+netbsd-curses.1f733118533f27a46eace23088df29355c274c551731022adb87ebe952a4a525
 #@untar:-z:sha256:755b87aa1e25c24c4c1668de5573d7d9a327b529423ce3ad9ee753bfb2296e33:.
 
 
diff --git a/variants/root-x86_64/ocaml-astring b/variants/root-x86_64/ocaml-astring
@@ -1,41 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.c1a193ddfa95033987ddee0659448ca47bb04b763f1365501b641bf9f6982cfd
-#+ocaml-findlib.0a3b6e3b270aa972f275bec43bce67a6d30cad130404cbe57c6a03966e28140a
-#+ocamlbuild.032727f6b2ee948f210be85284a0e636e08316e1c93afe82e1df314316d49dc6
-#+opam.c2a8c0e010d07606d512b99451330b03ddd8e3ce1c7bd361bf0f5022eb31d8b2
-#+ocaml-topkg.b07dd16010abde3b0f5f4b955f1557eaf8c67aed718e4bca1ed19ab99771decd
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+ocaml.4e147f44197963e62779246c71fb0f693dd4630999cd5c54fafa295988bfcdd0
+#+ocaml-findlib.72c97b4ed45b574cb8508d19877470293a777107ceb6b764233e8f7f794eb7a1
+#+ocamlbuild.31cfff00f4a8a43fb113faab807a85a9753deec3e7a9b3d793787b4794d8fdc9
+#+opam.ae76bbb636fc6be8856ead0684e6d6cff33452d945eef15a26746f13e2044db4
+#+ocaml-topkg.eb42271aaaeeb02bfdbcb9ea0c379d5c8722841851fb5862658ea97509bfff64
 #@untar:-j:sha256:865692630c07c3ab87c66cdfc2734c0fdfc9c34a57f8e89ffec7c7d15e7a70fa:.
 
 
diff --git a/variants/root-x86_64/ocaml-base b/variants/root-x86_64/ocaml-base
@@ -1,40 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.c1a193ddfa95033987ddee0659448ca47bb04b763f1365501b641bf9f6982cfd
-#+dune.ffb0f6215ba856863111df3ab35634e44a2638cd8036c83d02f37929904004e5
-#+ocaml_intrinsics_kernel.a7a6dc0ad3da8fac973733acdd7dc9fbb37a34a82d73b9d812362357a2bedeb7
-#+ocaml-sexplib0.f3a546838ae4235ce2f00b486d58ca6f2d03b38ddd33f09f292ba7eb155c623f
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+ocaml.4e147f44197963e62779246c71fb0f693dd4630999cd5c54fafa295988bfcdd0
+#+dune.ce02def698f57dc73fe3313d895b92790689ff3e7006dbf7c38c9a4ada92cf09
+#+ocaml_intrinsics_kernel.0b097c10a0c245971a8030ba76b962ebe9eb72a411eb081276428aad46a07995
+#+ocaml-sexplib0.fb54a9428e32956a24da26ef68ef13b135c2e4ce2ab9d5c6b68043169fab87be
 #@untar:-z:sha256:3f3f64789ab25bb5cb7f5f907dd651dec9cc9440981822fe75df6b94344b7208:.
 
 
diff --git a/variants/root-x86_64/ocaml-bos b/variants/root-x86_64/ocaml-bos
@@ -1,47 +1,45 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.c1a193ddfa95033987ddee0659448ca47bb04b763f1365501b641bf9f6982cfd
-#+ocaml-findlib.0a3b6e3b270aa972f275bec43bce67a6d30cad130404cbe57c6a03966e28140a
-#+ocamlbuild.032727f6b2ee948f210be85284a0e636e08316e1c93afe82e1df314316d49dc6
-#+opam.c2a8c0e010d07606d512b99451330b03ddd8e3ce1c7bd361bf0f5022eb31d8b2
-#+ocaml-topkg.b07dd16010abde3b0f5f4b955f1557eaf8c67aed718e4bca1ed19ab99771decd
-#+ocaml-astring.dcf1b70e2940d56e973f5b28d3b4a3f912a45413922fd477a0a980769c42aaa3
-#+ocaml-fpath.7b5e5c38cb521e5008e57505cefb1cd2957d868ce1d8cc771c7c158a22fb0c87
-#+ocaml-rresult.d03963dc178752b1a9f4ca52219ab1d291f6fe003ab2c024d51d3d2df9238fdd
-#+ocaml-fmt.1cbb1522009efdd42e27f4a8948428eaccc829e06a1d839366960207ac1c3c63
-#+ocaml-logs.302218320f614be7ae40aada7d90fd40c401367c3e3c6291304d5608ae75f928
-#+ocaml-mtime.dd14da3e368618987c975e1928bb6e96845f52ad91162021f2420139376d26a8
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+ocaml.4e147f44197963e62779246c71fb0f693dd4630999cd5c54fafa295988bfcdd0
+#+ocaml-findlib.72c97b4ed45b574cb8508d19877470293a777107ceb6b764233e8f7f794eb7a1
+#+ocamlbuild.31cfff00f4a8a43fb113faab807a85a9753deec3e7a9b3d793787b4794d8fdc9
+#+opam.ae76bbb636fc6be8856ead0684e6d6cff33452d945eef15a26746f13e2044db4
+#+ocaml-topkg.eb42271aaaeeb02bfdbcb9ea0c379d5c8722841851fb5862658ea97509bfff64
+#+ocaml-astring.a9588206bad3e7aeb72ec79b796ebc14291dd5b56a0cdededf5216c508871f4b
+#+ocaml-fpath.43ee95a7383d8eb20bbd67a3d6226948367bad306d007097cdc7ecea6460c0b0
+#+ocaml-rresult.c6e2054d4c73d6133e826e7c98d9eba0d5161f143e9922610d6ca4e02ee7c205
+#+ocaml-fmt.265efec517e5943af2fc87b62081b1b19beee838d0fbe03986f7600a62bfa7d8
+#+ocaml-logs.5febf3ea5e2211057a751b2c23ce3511df6e575aca3db4d542e87e1a0d6f99bd
+#+ocaml-mtime.f76a01a1a21400ecaa85c034d3d1950137efc1565671c1c700e06443707dd120
 #@untar:-j:sha256:d8d62e786b10d697e0457205a8eedeaa27ebcc90f1855f18df190cac2e3d8f37:.
 
 
diff --git a/variants/root-x86_64/ocaml-cmdliner b/variants/root-x86_64/ocaml-cmdliner
@@ -1,41 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.c1a193ddfa95033987ddee0659448ca47bb04b763f1365501b641bf9f6982cfd
-#+ocaml-findlib.0a3b6e3b270aa972f275bec43bce67a6d30cad130404cbe57c6a03966e28140a
-#+ocamlbuild.032727f6b2ee948f210be85284a0e636e08316e1c93afe82e1df314316d49dc6
-#+opam.c2a8c0e010d07606d512b99451330b03ddd8e3ce1c7bd361bf0f5022eb31d8b2
-#+ocaml-topkg.b07dd16010abde3b0f5f4b955f1557eaf8c67aed718e4bca1ed19ab99771decd
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+ocaml.4e147f44197963e62779246c71fb0f693dd4630999cd5c54fafa295988bfcdd0
+#+ocaml-findlib.72c97b4ed45b574cb8508d19877470293a777107ceb6b764233e8f7f794eb7a1
+#+ocamlbuild.31cfff00f4a8a43fb113faab807a85a9753deec3e7a9b3d793787b4794d8fdc9
+#+opam.ae76bbb636fc6be8856ead0684e6d6cff33452d945eef15a26746f13e2044db4
+#+ocaml-topkg.eb42271aaaeeb02bfdbcb9ea0c379d5c8722841851fb5862658ea97509bfff64
 #@untar:-j:sha256:4e547a631c36fbaadff60d3bd7724eb3f83ba274e92fb725950bae7868378582:.
 
 
diff --git a/variants/root-x86_64/ocaml-compiler-libs b/variants/root-x86_64/ocaml-compiler-libs
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.c1a193ddfa95033987ddee0659448ca47bb04b763f1365501b641bf9f6982cfd
-#+dune.ffb0f6215ba856863111df3ab35634e44a2638cd8036c83d02f37929904004e5
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+ocaml.4e147f44197963e62779246c71fb0f693dd4630999cd5c54fafa295988bfcdd0
+#+dune.ce02def698f57dc73fe3313d895b92790689ff3e7006dbf7c38c9a4ada92cf09
 #@untar:-z:sha256:9b9644d7351db699e57ddba7c767bb4153e6e988ccf45ead2fb238a3bd75cdc7:.
 
 
diff --git a/variants/root-x86_64/ocaml-cppo b/variants/root-x86_64/ocaml-cppo
@@ -1,39 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.c1a193ddfa95033987ddee0659448ca47bb04b763f1365501b641bf9f6982cfd
-#+dune.ffb0f6215ba856863111df3ab35634e44a2638cd8036c83d02f37929904004e5
-#+ocamlbuild.032727f6b2ee948f210be85284a0e636e08316e1c93afe82e1df314316d49dc6
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+ocaml.4e147f44197963e62779246c71fb0f693dd4630999cd5c54fafa295988bfcdd0
+#+dune.ce02def698f57dc73fe3313d895b92790689ff3e7006dbf7c38c9a4ada92cf09
+#+ocamlbuild.31cfff00f4a8a43fb113faab807a85a9753deec3e7a9b3d793787b4794d8fdc9
 #@untar:-z:sha256:6e62a8ee0217c9cc38d5860110eb18eb8d89c05c420353d298e1431fe8bac00f:.
 
 
diff --git a/variants/root-x86_64/ocaml-findlib b/variants/root-x86_64/ocaml-findlib
@@ -1,41 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+m4.a52b544a61e3d3890392553a1c63a5c3ee7a4c4c5d0c7685ebfb9f828a3ef2bf
-#+netbsd-curses.13fe55dba92600b0b78807aede98bb38e2260ff6d1bcad927a7e403175db9bf6
-#+ocaml.c1a193ddfa95033987ddee0659448ca47bb04b763f1365501b641bf9f6982cfd
-#+ocamlbuild.032727f6b2ee948f210be85284a0e636e08316e1c93afe82e1df314316d49dc6
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+m4.4883a41081b9cdff29d76e24ccadd5dea8897716f9e5b20789d7489c2db62170
+#+netbsd-curses.1f733118533f27a46eace23088df29355c274c551731022adb87ebe952a4a525
+#+ocaml.4e147f44197963e62779246c71fb0f693dd4630999cd5c54fafa295988bfcdd0
+#+ocamlbuild.31cfff00f4a8a43fb113faab807a85a9753deec3e7a9b3d793787b4794d8fdc9
 #@untar:-z:sha256:662c910f774e9fee3a19c4e057f380581ab2fc4ee52da4761304ac9c31b8869d:.
 
 
@@ -81,7 +79,7 @@ cd 'findlib-1.9.8'
 make -j1 all opt
 
 # workaround `topfind` getting installed to stdlib directory, this is not configurable
-stdlib="$pthbs_destdir/versions/ocaml.c1a193ddfa95033987ddee0659448ca47bb04b763f1365501b641bf9f6982cfd"
+stdlib="$pthbs_destdir/versions/ocaml.4e147f44197963e62779246c71fb0f693dd4630999cd5c54fafa295988bfcdd0"
 mkdir -p "${stdlib%/*}"
 ln -s "$pthbs_package" "$stdlib"
 make install prefix="$pthbs_destdir"
diff --git a/variants/root-x86_64/ocaml-fmt b/variants/root-x86_64/ocaml-fmt
@@ -1,42 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.c1a193ddfa95033987ddee0659448ca47bb04b763f1365501b641bf9f6982cfd
-#+ocaml-findlib.0a3b6e3b270aa972f275bec43bce67a6d30cad130404cbe57c6a03966e28140a
-#+ocamlbuild.032727f6b2ee948f210be85284a0e636e08316e1c93afe82e1df314316d49dc6
-#+opam.c2a8c0e010d07606d512b99451330b03ddd8e3ce1c7bd361bf0f5022eb31d8b2
-#+ocaml-topkg.b07dd16010abde3b0f5f4b955f1557eaf8c67aed718e4bca1ed19ab99771decd
-#+ocaml-cmdliner.bc59a8e0d8d3faca5c4eb9c0ae535b6c82c49c1ccb3b9deeda1f06ff5d779a36
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+ocaml.4e147f44197963e62779246c71fb0f693dd4630999cd5c54fafa295988bfcdd0
+#+ocaml-findlib.72c97b4ed45b574cb8508d19877470293a777107ceb6b764233e8f7f794eb7a1
+#+ocamlbuild.31cfff00f4a8a43fb113faab807a85a9753deec3e7a9b3d793787b4794d8fdc9
+#+opam.ae76bbb636fc6be8856ead0684e6d6cff33452d945eef15a26746f13e2044db4
+#+ocaml-topkg.eb42271aaaeeb02bfdbcb9ea0c379d5c8722841851fb5862658ea97509bfff64
+#+ocaml-cmdliner.1406de8742e76f6a26452e4048a397ddc5ceafdd9def89bcb0f171bed24d8b00
 #@untar:-j:sha256:857cfd47a54b52429cd9b3e2665e44173cd1bd3b435bece7172f984ad5376a1b:.
 
 
diff --git a/variants/root-x86_64/ocaml-fpath b/variants/root-x86_64/ocaml-fpath
@@ -1,42 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.c1a193ddfa95033987ddee0659448ca47bb04b763f1365501b641bf9f6982cfd
-#+ocaml-findlib.0a3b6e3b270aa972f275bec43bce67a6d30cad130404cbe57c6a03966e28140a
-#+ocamlbuild.032727f6b2ee948f210be85284a0e636e08316e1c93afe82e1df314316d49dc6
-#+opam.c2a8c0e010d07606d512b99451330b03ddd8e3ce1c7bd361bf0f5022eb31d8b2
-#+ocaml-topkg.b07dd16010abde3b0f5f4b955f1557eaf8c67aed718e4bca1ed19ab99771decd
-#+ocaml-astring.dcf1b70e2940d56e973f5b28d3b4a3f912a45413922fd477a0a980769c42aaa3
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+ocaml.4e147f44197963e62779246c71fb0f693dd4630999cd5c54fafa295988bfcdd0
+#+ocaml-findlib.72c97b4ed45b574cb8508d19877470293a777107ceb6b764233e8f7f794eb7a1
+#+ocamlbuild.31cfff00f4a8a43fb113faab807a85a9753deec3e7a9b3d793787b4794d8fdc9
+#+opam.ae76bbb636fc6be8856ead0684e6d6cff33452d945eef15a26746f13e2044db4
+#+ocaml-topkg.eb42271aaaeeb02bfdbcb9ea0c379d5c8722841851fb5862658ea97509bfff64
+#+ocaml-astring.a9588206bad3e7aeb72ec79b796ebc14291dd5b56a0cdededf5216c508871f4b
 #@untar:-j:sha256:12b08ff192d037d9b6d69e9ca19d1d385184f20b3237c27231e437ac81ace70f:.
 
 
diff --git a/variants/root-x86_64/ocaml-logs b/variants/root-x86_64/ocaml-logs
@@ -1,44 +1,42 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.c1a193ddfa95033987ddee0659448ca47bb04b763f1365501b641bf9f6982cfd
-#+ocaml-findlib.0a3b6e3b270aa972f275bec43bce67a6d30cad130404cbe57c6a03966e28140a
-#+ocamlbuild.032727f6b2ee948f210be85284a0e636e08316e1c93afe82e1df314316d49dc6
-#+opam.c2a8c0e010d07606d512b99451330b03ddd8e3ce1c7bd361bf0f5022eb31d8b2
-#+ocaml-topkg.b07dd16010abde3b0f5f4b955f1557eaf8c67aed718e4bca1ed19ab99771decd
-#+ocaml-mtime.dd14da3e368618987c975e1928bb6e96845f52ad91162021f2420139376d26a8
-#+ocaml-cmdliner.bc59a8e0d8d3faca5c4eb9c0ae535b6c82c49c1ccb3b9deeda1f06ff5d779a36
-#+ocaml-fmt.1cbb1522009efdd42e27f4a8948428eaccc829e06a1d839366960207ac1c3c63
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+ocaml.4e147f44197963e62779246c71fb0f693dd4630999cd5c54fafa295988bfcdd0
+#+ocaml-findlib.72c97b4ed45b574cb8508d19877470293a777107ceb6b764233e8f7f794eb7a1
+#+ocamlbuild.31cfff00f4a8a43fb113faab807a85a9753deec3e7a9b3d793787b4794d8fdc9
+#+opam.ae76bbb636fc6be8856ead0684e6d6cff33452d945eef15a26746f13e2044db4
+#+ocaml-topkg.eb42271aaaeeb02bfdbcb9ea0c379d5c8722841851fb5862658ea97509bfff64
+#+ocaml-mtime.f76a01a1a21400ecaa85c034d3d1950137efc1565671c1c700e06443707dd120
+#+ocaml-cmdliner.1406de8742e76f6a26452e4048a397ddc5ceafdd9def89bcb0f171bed24d8b00
+#+ocaml-fmt.265efec517e5943af2fc87b62081b1b19beee838d0fbe03986f7600a62bfa7d8
 #@untar:-j:sha256:ee97065ba41ce28f19dea9453c6bec4e0ef26165ad7394c4131ea0c65c0f06d5:.
 
 
diff --git a/variants/root-x86_64/ocaml-lun b/variants/root-x86_64/ocaml-lun
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.c1a193ddfa95033987ddee0659448ca47bb04b763f1365501b641bf9f6982cfd
-#+dune.ffb0f6215ba856863111df3ab35634e44a2638cd8036c83d02f37929904004e5
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+ocaml.4e147f44197963e62779246c71fb0f693dd4630999cd5c54fafa295988bfcdd0
+#+dune.ce02def698f57dc73fe3313d895b92790689ff3e7006dbf7c38c9a4ada92cf09
 #@untar:-j:sha256:cca8badff83b470fdcfb1840116f8e8a6f2cb86cde2f44ed28cf26cbf692a793:.
 
 
diff --git a/variants/root-x86_64/ocaml-mtime b/variants/root-x86_64/ocaml-mtime
@@ -1,41 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.c1a193ddfa95033987ddee0659448ca47bb04b763f1365501b641bf9f6982cfd
-#+ocaml-findlib.0a3b6e3b270aa972f275bec43bce67a6d30cad130404cbe57c6a03966e28140a
-#+ocamlbuild.032727f6b2ee948f210be85284a0e636e08316e1c93afe82e1df314316d49dc6
-#+opam.c2a8c0e010d07606d512b99451330b03ddd8e3ce1c7bd361bf0f5022eb31d8b2
-#+ocaml-topkg.b07dd16010abde3b0f5f4b955f1557eaf8c67aed718e4bca1ed19ab99771decd
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+ocaml.4e147f44197963e62779246c71fb0f693dd4630999cd5c54fafa295988bfcdd0
+#+ocaml-findlib.72c97b4ed45b574cb8508d19877470293a777107ceb6b764233e8f7f794eb7a1
+#+ocamlbuild.31cfff00f4a8a43fb113faab807a85a9753deec3e7a9b3d793787b4794d8fdc9
+#+opam.ae76bbb636fc6be8856ead0684e6d6cff33452d945eef15a26746f13e2044db4
+#+ocaml-topkg.eb42271aaaeeb02bfdbcb9ea0c379d5c8722841851fb5862658ea97509bfff64
 #@untar:-j:sha256:097cb2802e3701ead9572e1b483d5a28c6e2f0a39449faaf9b44ad8a89834d88:.
 
 
diff --git a/variants/root-x86_64/ocaml-ppx_derivers b/variants/root-x86_64/ocaml-ppx_derivers
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.c1a193ddfa95033987ddee0659448ca47bb04b763f1365501b641bf9f6982cfd
-#+dune.ffb0f6215ba856863111df3ab35634e44a2638cd8036c83d02f37929904004e5
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+ocaml.4e147f44197963e62779246c71fb0f693dd4630999cd5c54fafa295988bfcdd0
+#+dune.ce02def698f57dc73fe3313d895b92790689ff3e7006dbf7c38c9a4ada92cf09
 #@untar:-z:sha256:b6595ee187dea792b31fc54a0e1524ab1e48bc6068d3066c45215a138cc73b95:.
 
 
diff --git a/variants/root-x86_64/ocaml-ppx_deriving b/variants/root-x86_64/ocaml-ppx_deriving
@@ -1,45 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.c1a193ddfa95033987ddee0659448ca47bb04b763f1365501b641bf9f6982cfd
-#+dune.ffb0f6215ba856863111df3ab35634e44a2638cd8036c83d02f37929904004e5
-#+ocaml-compiler-libs.9c1fe64022f879bdc3ef512f88b36bee48c81595280860965b2576655f284821
-#+ocaml-cppo.205f12d0501342fcbe9e07d1b0b12637f4c70fb599b426e47b0e144e9a6f978b
-#+ocaml-findlib.0a3b6e3b270aa972f275bec43bce67a6d30cad130404cbe57c6a03966e28140a
-#+ocaml-ppx_derivers.8e38aabbd0606817578b9e33506217c1e55a41cbba57166d9a4c766f0d1a4920
-#+ocaml-ppxlib.600ff59f63162bf5a339234dd9e3a27f05ebbd677450680b22f8a962f2647986
-#+ocaml-sexplib0.f3a546838ae4235ce2f00b486d58ca6f2d03b38ddd33f09f292ba7eb155c623f
-#+ocaml-stdlib-shims.2d7c3dd6df966562ba5dadf75beec93134bc9f9bb52d400a0d784861e8f59571
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+ocaml.4e147f44197963e62779246c71fb0f693dd4630999cd5c54fafa295988bfcdd0
+#+dune.ce02def698f57dc73fe3313d895b92790689ff3e7006dbf7c38c9a4ada92cf09
+#+ocaml-compiler-libs.99e8ffe9975afa97d12aa32a02c0af89f00a1f84baabb24a3503d704d9986cbd
+#+ocaml-cppo.a8ec745ba4691424da089f69ace7b4aa91db681957af6183fba166e7adcdcaef
+#+ocaml-findlib.72c97b4ed45b574cb8508d19877470293a777107ceb6b764233e8f7f794eb7a1
+#+ocaml-ppx_derivers.d4c93543873a26507cea1e4c254287bccb3677c61dda8c089b46530bf6f09091
+#+ocaml-ppxlib.1c88e3af4acab38f7b1a33d74831f583c1b9e4e2904e04a4e7bdefd0ac3795c8
+#+ocaml-sexplib0.fb54a9428e32956a24da26ef68ef13b135c2e4ce2ab9d5c6b68043169fab87be
+#+ocaml-stdlib-shims.b069d469d354d2d730b4945fb4b4db9e46f418fa191af35a7f5d74340c276471
 #@untar:-z:sha256:c91d1ea5e15e6928a2f8947dbd135b9f765cc0e2d72be271427981afcd350c24:.
 
 
diff --git a/variants/root-x86_64/ocaml-ppxlib b/variants/root-x86_64/ocaml-ppxlib
@@ -1,42 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.c1a193ddfa95033987ddee0659448ca47bb04b763f1365501b641bf9f6982cfd
-#+dune.ffb0f6215ba856863111df3ab35634e44a2638cd8036c83d02f37929904004e5
-#+ocaml-compiler-libs.9c1fe64022f879bdc3ef512f88b36bee48c81595280860965b2576655f284821
-#+ocaml-ppx_derivers.8e38aabbd0606817578b9e33506217c1e55a41cbba57166d9a4c766f0d1a4920
-#+ocaml-sexplib0.f3a546838ae4235ce2f00b486d58ca6f2d03b38ddd33f09f292ba7eb155c623f
-#+ocaml-stdlib-shims.2d7c3dd6df966562ba5dadf75beec93134bc9f9bb52d400a0d784861e8f59571
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+ocaml.4e147f44197963e62779246c71fb0f693dd4630999cd5c54fafa295988bfcdd0
+#+dune.ce02def698f57dc73fe3313d895b92790689ff3e7006dbf7c38c9a4ada92cf09
+#+ocaml-compiler-libs.99e8ffe9975afa97d12aa32a02c0af89f00a1f84baabb24a3503d704d9986cbd
+#+ocaml-ppx_derivers.d4c93543873a26507cea1e4c254287bccb3677c61dda8c089b46530bf6f09091
+#+ocaml-sexplib0.fb54a9428e32956a24da26ef68ef13b135c2e4ce2ab9d5c6b68043169fab87be
+#+ocaml-stdlib-shims.b069d469d354d2d730b4945fb4b4db9e46f418fa191af35a7f5d74340c276471
 #@untar:-j:sha256:2e223837e7cecc3bc84a432432c0a72f4e1d5be9165c9c33772f156db85db0b3:.
 
 
diff --git a/variants/root-x86_64/ocaml-rresult b/variants/root-x86_64/ocaml-rresult
@@ -1,41 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.c1a193ddfa95033987ddee0659448ca47bb04b763f1365501b641bf9f6982cfd
-#+ocaml-findlib.0a3b6e3b270aa972f275bec43bce67a6d30cad130404cbe57c6a03966e28140a
-#+ocamlbuild.032727f6b2ee948f210be85284a0e636e08316e1c93afe82e1df314316d49dc6
-#+opam.c2a8c0e010d07606d512b99451330b03ddd8e3ce1c7bd361bf0f5022eb31d8b2
-#+ocaml-topkg.b07dd16010abde3b0f5f4b955f1557eaf8c67aed718e4bca1ed19ab99771decd
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+ocaml.4e147f44197963e62779246c71fb0f693dd4630999cd5c54fafa295988bfcdd0
+#+ocaml-findlib.72c97b4ed45b574cb8508d19877470293a777107ceb6b764233e8f7f794eb7a1
+#+ocamlbuild.31cfff00f4a8a43fb113faab807a85a9753deec3e7a9b3d793787b4794d8fdc9
+#+opam.ae76bbb636fc6be8856ead0684e6d6cff33452d945eef15a26746f13e2044db4
+#+ocaml-topkg.eb42271aaaeeb02bfdbcb9ea0c379d5c8722841851fb5862658ea97509bfff64
 #@untar:-j:sha256:11aa7f5b83460e60431e3154e3e32c071d46e151ea5760cf24377805bf975540:.
 
 
diff --git a/variants/root-x86_64/ocaml-sexplib0 b/variants/root-x86_64/ocaml-sexplib0
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.c1a193ddfa95033987ddee0659448ca47bb04b763f1365501b641bf9f6982cfd
-#+dune.ffb0f6215ba856863111df3ab35634e44a2638cd8036c83d02f37929904004e5
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+ocaml.4e147f44197963e62779246c71fb0f693dd4630999cd5c54fafa295988bfcdd0
+#+dune.ce02def698f57dc73fe3313d895b92790689ff3e7006dbf7c38c9a4ada92cf09
 #@untar:-z:sha256:86dba26468194512f789f2fb709063515a9cb4e5c4461c021c239a369590701d:.
 
 
diff --git a/variants/root-x86_64/ocaml-stdlib-shims b/variants/root-x86_64/ocaml-stdlib-shims
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.c1a193ddfa95033987ddee0659448ca47bb04b763f1365501b641bf9f6982cfd
-#+dune.ffb0f6215ba856863111df3ab35634e44a2638cd8036c83d02f37929904004e5
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+ocaml.4e147f44197963e62779246c71fb0f693dd4630999cd5c54fafa295988bfcdd0
+#+dune.ce02def698f57dc73fe3313d895b92790689ff3e7006dbf7c38c9a4ada92cf09
 #@untar:-j:sha256:babf72d3917b86f707885f0c5528e36c63fccb698f4b46cf2bab5c7ccdd6d84a:.
 
 
diff --git a/variants/root-x86_64/ocaml-topkg b/variants/root-x86_64/ocaml-topkg
@@ -1,40 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.c1a193ddfa95033987ddee0659448ca47bb04b763f1365501b641bf9f6982cfd
-#+ocaml-findlib.0a3b6e3b270aa972f275bec43bce67a6d30cad130404cbe57c6a03966e28140a
-#+ocamlbuild.032727f6b2ee948f210be85284a0e636e08316e1c93afe82e1df314316d49dc6
-#+opam.c2a8c0e010d07606d512b99451330b03ddd8e3ce1c7bd361bf0f5022eb31d8b2
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+ocaml.4e147f44197963e62779246c71fb0f693dd4630999cd5c54fafa295988bfcdd0
+#+ocaml-findlib.72c97b4ed45b574cb8508d19877470293a777107ceb6b764233e8f7f794eb7a1
+#+ocamlbuild.31cfff00f4a8a43fb113faab807a85a9753deec3e7a9b3d793787b4794d8fdc9
+#+opam.ae76bbb636fc6be8856ead0684e6d6cff33452d945eef15a26746f13e2044db4
 #@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.c1a193ddfa95033987ddee0659448ca47bb04b763f1365501b641bf9f6982cfd
-#+dune.ffb0f6215ba856863111df3ab35634e44a2638cd8036c83d02f37929904004e5
-#+ocamlbuild.032727f6b2ee948f210be85284a0e636e08316e1c93afe82e1df314316d49dc6
-#+ocaml-base.37d6c1a44d2702d938931713cffb379f76613ad152ce2452094e8404a1ad90a1
-#+opam.c2a8c0e010d07606d512b99451330b03ddd8e3ce1c7bd361bf0f5022eb31d8b2
-#+ocaml-bos.9728ab38f347793bf64fac338f8063cb916c368b77cab918fea5c9f4a968f911
-#+ocaml-lun.85abbb9207a5bb648d4aca4d47c1447e185b99e512930dc174844e18f774db6f
-#+ocaml-ppx_deriving.3b77892f96a6abe55e020c2a41d79b56af46e8484f9c52e25636d246cfed557f-
\ No newline at end of file
+#+ocaml.4e147f44197963e62779246c71fb0f693dd4630999cd5c54fafa295988bfcdd0
+#+dune.ce02def698f57dc73fe3313d895b92790689ff3e7006dbf7c38c9a4ada92cf09
+#+ocamlbuild.31cfff00f4a8a43fb113faab807a85a9753deec3e7a9b3d793787b4794d8fdc9
+#+ocaml-base.dc958f9a1d7ce0d1d5b25eec86ecfab63c99cd85a3970f38cc86d844d404b608
+#+opam.ae76bbb636fc6be8856ead0684e6d6cff33452d945eef15a26746f13e2044db4
+#+ocaml-bos.456f93b9089d8e129ba02229b133fcb9437d3cfc709a52320f2d4c0c5a382a88
+#+ocaml-lun.c445aad84a3d3a25909168a0921f9ae5d15c493c4f71ab6f9b6807473a80dc1e
+#+ocaml-ppx_deriving.97120fe78d4172468213335db30186d7724d1216f1ad3e174335c48a61baa134+
\ No newline at end of file
diff --git a/variants/root-x86_64/ocaml:dynlink b/variants/root-x86_64/ocaml:dynlink
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+m4.a52b544a61e3d3890392553a1c63a5c3ee7a4c4c5d0c7685ebfb9f828a3ef2bf
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+m4.4883a41081b9cdff29d76e24ccadd5dea8897716f9e5b20789d7489c2db62170
 #@untar:-J:sha256:dfaa8a2e11c799bc1765d8bef44911406ee5f4803027190382a939f88c912266:.
 
 
diff --git a/variants/root-x86_64/ocaml_intrinsics_kernel b/variants/root-x86_64/ocaml_intrinsics_kernel
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.c1a193ddfa95033987ddee0659448ca47bb04b763f1365501b641bf9f6982cfd
-#+dune.ffb0f6215ba856863111df3ab35634e44a2638cd8036c83d02f37929904004e5
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+ocaml.4e147f44197963e62779246c71fb0f693dd4630999cd5c54fafa295988bfcdd0
+#+dune.ce02def698f57dc73fe3313d895b92790689ff3e7006dbf7c38c9a4ada92cf09
 #@untar:-z:sha256:c988b7769a59749631c3c98ba5edd1d2fe91f5dc380b5e0593c073c92f4bee01:.
 
 
diff --git a/variants/root-x86_64/ocamlbuild b/variants/root-x86_64/ocamlbuild
@@ -1,39 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+m4.a52b544a61e3d3890392553a1c63a5c3ee7a4c4c5d0c7685ebfb9f828a3ef2bf
-#+ocaml.c1a193ddfa95033987ddee0659448ca47bb04b763f1365501b641bf9f6982cfd
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+m4.4883a41081b9cdff29d76e24ccadd5dea8897716f9e5b20789d7489c2db62170
+#+ocaml.4e147f44197963e62779246c71fb0f693dd4630999cd5c54fafa295988bfcdd0
 #@untar:-z:sha256:2ba6857f2991b7f69368e8db818b163d31cf5a367f15f5953bf8f01a77b3d4fc:.
 
 
@@ -77,7 +75,7 @@ make configure \
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
 # workaround ocamlbuild manpage getting installed to stdlib directory
-stdlib="$pthbs_destdir/versions/ocaml.c1a193ddfa95033987ddee0659448ca47bb04b763f1365501b641bf9f6982cfd"
+stdlib="$pthbs_destdir/versions/ocaml.4e147f44197963e62779246c71fb0f693dd4630999cd5c54fafa295988bfcdd0"
 mkdir -p "${stdlib%/*}"
 ln -s "$pthbs_package" "$stdlib"
 
diff --git a/variants/root-x86_64/opam b/variants/root-x86_64/opam
@@ -1,41 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+diffutils.d9f34e8ddf24f4144bb974b8cf3ec0d25454280089f1a6cc514034e19c53ce57
-#+patch.f96ad537c882a1bed9479ea978ccc31fbcbee68a1d18a5deb9003258bc58f2ce
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+getconf.0fcd3838a99034e1880560e0bc83f9440df26b175b9c7182cd73cdaf454d229a
-#+ocaml.c1a193ddfa95033987ddee0659448ca47bb04b763f1365501b641bf9f6982cfd
-#+dune.ffb0f6215ba856863111df3ab35634e44a2638cd8036c83d02f37929904004e5
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+diffutils.ce1debc080204cf007a72b5cf9cd4f903c3f4f09fd33bf147d5e6ea407f7c1dc
+#+patch.a7f1a33763eeb4c7728022e5cf4f69c537c12ee97b8de5b76610f2fde144fa84
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+getconf.207e54372f55843e89d07e08eaee256e35497e1f494a95aee306d6c6a38d48d7
+#+ocaml.4e147f44197963e62779246c71fb0f693dd4630999cd5c54fafa295988bfcdd0
+#+dune.ce02def698f57dc73fe3313d895b92790689ff3e7006dbf7c38c9a4ada92cf09
 #@untar:-z:sha256:c4d053029793c714e4e7340b1157428c0f90783585fb17f35158247a640467d9:.
 
 
@@ -74,7 +72,7 @@ export DUNE_CACHE=disabled
 	--infodir="$prefix/info" \
 	--localedir="$prefix/locale" \
 	--localstatedir='/var/pthbs' \
-	--with-dune='/versions/dune.ffb0f6215ba856863111df3ab35634e44a2638cd8036c83d02f37929904004e5/command/dune' \
+	--with-dune='/versions/dune.ce02def698f57dc73fe3313d895b92790689ff3e7006dbf7c38c9a4ada92cf09/command/dune' \
 	--with-mccs \
 	--with-vendored-deps \
 	--enable-static
diff --git a/variants/root-x86_64/patch b/variants/root-x86_64/patch
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+m4.a52b544a61e3d3890392553a1c63a5c3ee7a4c4c5d0c7685ebfb9f828a3ef2bf
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+m4.4883a41081b9cdff29d76e24ccadd5dea8897716f9e5b20789d7489c2db62170
 #@untar:-J:sha256:ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd:.
 
 
diff --git a/variants/root-x86_64/pkgconf b/variants/root-x86_64/pkgconf
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+m4.a52b544a61e3d3890392553a1c63a5c3ee7a4c4c5d0c7685ebfb9f828a3ef2bf
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+m4.4883a41081b9cdff29d76e24ccadd5dea8897716f9e5b20789d7489c2db62170
 #@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.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+pkgconf.7228487124f64f858936185b6dcbae849df7eddeb6b231dbb31c09993bf1d8cb
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+pkgconf.8fcefa26f2a619250fea1164c4ab9b05bf7e8f78c916b18bab5ccc4552117dbd
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/popt b/variants/root-x86_64/popt
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+m4.a52b544a61e3d3890392553a1c63a5c3ee7a4c4c5d0c7685ebfb9f828a3ef2bf
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+m4.4883a41081b9cdff29d76e24ccadd5dea8897716f9e5b20789d7489c2db62170
 #@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.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+zsh.786b35599b47e5a64e8f64b6853fed96325776545db70e7c5d41d519337e8668
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+zsh.52c232b069e8cfa3d25529f8680f9b793eb9ecbd805f5f44942c61089e0934a7
 #@sha256:1e021bddaf5c020ede9107656494715236a894557b99035365fc999605541b2d:pthbs-banginstall
 
 
diff --git a/variants/root-x86_64/rsync b/variants/root-x86_64/rsync
@@ -1,41 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+m4.a52b544a61e3d3890392553a1c63a5c3ee7a4c4c5d0c7685ebfb9f828a3ef2bf
-#+nawk.9ffe9e8ced505282f9526814564a6fbd53b46a34c3c533cdbeb35679a5986805
-#+popt.8f75fb1be5112cb719418584a688313aa9f9c1447f547d5738c5b57a1d32072c
-#+libressl.6946b4de4f6a6da96980a9b0e95157a75850c4bf9a93c761c8d6f9ab918c6e7e
-#+zstd.78d52b3e7f0cfe343a81f7e5932a4469e0ec04d33e415fae0fd5821f099f89ca
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+m4.4883a41081b9cdff29d76e24ccadd5dea8897716f9e5b20789d7489c2db62170
+#+nawk.a45f17510ace9517b9d7c542d513276f0f6ac6b18fa795e3ece69be76dfdcdaa
+#+popt.c1840c4dd4aef09e3007fc9b79b2c3aab3bcd3141db65fb19683bdaf487e44eb
+#+libressl.737550246c5f7966d58e66007cd0328a5a10af72c47b86189c7bd24d02903b40
+#+zstd.4d0316139a860ab98a38660f734fae196cacdc04bf56f4d45b0a692d06473fe1
 #@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:.
 
 
diff --git a/variants/root-x86_64/s6 b/variants/root-x86_64/s6
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+skalibs.a27479ee71afba38615e09103dbe1e5559e6ef9c756c5deb8217626dbe0a84ed
-#+execline.62309d4bece25d9fd9801a7e9e9e4a97e5a26cc6d8b6ec40f2420ecf0e22a677
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+skalibs.d52c18eb24868694a2361276e9de0be604913ee74428ea7a2eb5bd9cb9349b14
+#+execline.5597cefe7a3464a1a03ef20a49a1aefb98ada3e016a0c3331ad0023ad8647ec3
 #@git:0e02fe0e92b8f9a619fc355babad2c78c009c1f1:s6
 
 
@@ -49,7 +47,7 @@ cd 's6'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.a27479ee71afba38615e09103dbe1e5559e6ef9c756c5deb8217626dbe0a84ed/sysdeps' \
+	--with-sysdeps='/versions/skalibs.d52c18eb24868694a2361276e9de0be604913ee74428ea7a2eb5bd9cb9349b14/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/root-x86_64/s6-dns b/variants/root-x86_64/s6-dns
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+skalibs.a27479ee71afba38615e09103dbe1e5559e6ef9c756c5deb8217626dbe0a84ed
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+skalibs.d52c18eb24868694a2361276e9de0be604913ee74428ea7a2eb5bd9cb9349b14
 #@git:dc80225c0a78346300d100f0bf0182ed338c4b01:s6-dns
 
 
@@ -48,7 +46,7 @@ cd 's6-dns'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.a27479ee71afba38615e09103dbe1e5559e6ef9c756c5deb8217626dbe0a84ed/sysdeps' \
+	--with-sysdeps='/versions/skalibs.d52c18eb24868694a2361276e9de0be604913ee74428ea7a2eb5bd9cb9349b14/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/root-x86_64/s6-linux-init b/variants/root-x86_64/s6-linux-init
@@ -1,39 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+skalibs.a27479ee71afba38615e09103dbe1e5559e6ef9c756c5deb8217626dbe0a84ed
-#+execline.62309d4bece25d9fd9801a7e9e9e4a97e5a26cc6d8b6ec40f2420ecf0e22a677
-#+s6.e97bd84122cca75a7b68f68889496be7a5609e4a94bfa4a337e2787dcd79fc15
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+skalibs.d52c18eb24868694a2361276e9de0be604913ee74428ea7a2eb5bd9cb9349b14
+#+execline.5597cefe7a3464a1a03ef20a49a1aefb98ada3e016a0c3331ad0023ad8647ec3
+#+s6.2fcd8917da46cad0ccaa860ae3f5516dc321f0534f674d390ae62b9c931c67ee
 #@git:b298e515efe16210048e504e3aec89ea1e627b73:s6-linux-init
 
 
@@ -50,7 +48,7 @@ cd 's6-linux-init'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.a27479ee71afba38615e09103dbe1e5559e6ef9c756c5deb8217626dbe0a84ed/sysdeps' \
+	--with-sysdeps='/versions/skalibs.d52c18eb24868694a2361276e9de0be604913ee74428ea7a2eb5bd9cb9349b14/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/root-x86_64/s6-linux-utils b/variants/root-x86_64/s6-linux-utils
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+skalibs.a27479ee71afba38615e09103dbe1e5559e6ef9c756c5deb8217626dbe0a84ed
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+skalibs.d52c18eb24868694a2361276e9de0be604913ee74428ea7a2eb5bd9cb9349b14
 #@git:a9e7acac41a8854546246dd39cb4daee54ead2cb:s6-linux-utils
 
 
@@ -48,7 +46,7 @@ cd 's6-linux-utils'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.a27479ee71afba38615e09103dbe1e5559e6ef9c756c5deb8217626dbe0a84ed/sysdeps' \
+	--with-sysdeps='/versions/skalibs.d52c18eb24868694a2361276e9de0be604913ee74428ea7a2eb5bd9cb9349b14/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/root-x86_64/s6-networking b/variants/root-x86_64/s6-networking
@@ -1,41 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+skalibs.a27479ee71afba38615e09103dbe1e5559e6ef9c756c5deb8217626dbe0a84ed
-#+execline.62309d4bece25d9fd9801a7e9e9e4a97e5a26cc6d8b6ec40f2420ecf0e22a677
-#+s6.e97bd84122cca75a7b68f68889496be7a5609e4a94bfa4a337e2787dcd79fc15
-#+s6-dns.89aa6accc46063e7b805e01921a5e0c65f2030b1a8046587e8eb033ceb4b9eef
-#+libressl.6946b4de4f6a6da96980a9b0e95157a75850c4bf9a93c761c8d6f9ab918c6e7e
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+skalibs.d52c18eb24868694a2361276e9de0be604913ee74428ea7a2eb5bd9cb9349b14
+#+execline.5597cefe7a3464a1a03ef20a49a1aefb98ada3e016a0c3331ad0023ad8647ec3
+#+s6.2fcd8917da46cad0ccaa860ae3f5516dc321f0534f674d390ae62b9c931c67ee
+#+s6-dns.2b4ed643da7bc8ac9b8e8b54524e6ae119654c1556c6a50b46563bfa2895ec70
+#+libressl.737550246c5f7966d58e66007cd0328a5a10af72c47b86189c7bd24d02903b40
 #@git:12b40106ed1727274cd6af379c4ba0ca7161700b:s6-networking
 
 
@@ -52,7 +50,7 @@ cd 's6-networking'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.a27479ee71afba38615e09103dbe1e5559e6ef9c756c5deb8217626dbe0a84ed/sysdeps' \
+	--with-sysdeps='/versions/skalibs.d52c18eb24868694a2361276e9de0be604913ee74428ea7a2eb5bd9cb9349b14/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/root-x86_64/s6-portable-utils b/variants/root-x86_64/s6-portable-utils
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+skalibs.a27479ee71afba38615e09103dbe1e5559e6ef9c756c5deb8217626dbe0a84ed
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+skalibs.d52c18eb24868694a2361276e9de0be604913ee74428ea7a2eb5bd9cb9349b14
 #@git:dc96d8a020e83b16dd7a8bd093bdb00ab2b944c0:s6-portable-utils
 
 
@@ -48,7 +46,7 @@ cd 's6-portable-utils'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.a27479ee71afba38615e09103dbe1e5559e6ef9c756c5deb8217626dbe0a84ed/sysdeps' \
+	--with-sysdeps='/versions/skalibs.d52c18eb24868694a2361276e9de0be604913ee74428ea7a2eb5bd9cb9349b14/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/root-x86_64/s6-rc b/variants/root-x86_64/s6-rc
@@ -1,39 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+skalibs.a27479ee71afba38615e09103dbe1e5559e6ef9c756c5deb8217626dbe0a84ed
-#+execline.62309d4bece25d9fd9801a7e9e9e4a97e5a26cc6d8b6ec40f2420ecf0e22a677
-#+s6.e97bd84122cca75a7b68f68889496be7a5609e4a94bfa4a337e2787dcd79fc15
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+skalibs.d52c18eb24868694a2361276e9de0be604913ee74428ea7a2eb5bd9cb9349b14
+#+execline.5597cefe7a3464a1a03ef20a49a1aefb98ada3e016a0c3331ad0023ad8647ec3
+#+s6.2fcd8917da46cad0ccaa860ae3f5516dc321f0534f674d390ae62b9c931c67ee
 #@git:a4756f00b3823952580d1fee704675c6f813a248:s6-rc
 
 
@@ -50,7 +48,7 @@ cd 's6-rc'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.a27479ee71afba38615e09103dbe1e5559e6ef9c756c5deb8217626dbe0a84ed/sysdeps' \
+	--with-sysdeps='/versions/skalibs.d52c18eb24868694a2361276e9de0be604913ee74428ea7a2eb5bd9cb9349b14/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/root-x86_64/skalibs b/variants/root-x86_64/skalibs
@@ -1,36 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
 #@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.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+zsh.786b35599b47e5a64e8f64b6853fed96325776545db70e7c5d41d519337e8668
-#+pthbs-banginstall.e0b92a53563e59c27563cff50c09e7fe23b02ec2b5114f78c7e6cb4902467c48
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+zsh.52c232b069e8cfa3d25529f8680f9b793eb9ecbd805f5f44942c61089e0934a7
+#+pthbs-banginstall.11a4dfa7bbf19f57643e1f71dae30a17ee21b42960bf46b4328cc685c50d8204
 #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep
 
 
diff --git a/variants/root-x86_64/squashfs-tools b/variants/root-x86_64/squashfs-tools
@@ -1,39 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+attr.2deab0952c63f4215a9b269dce5c662474dcfbfeed26983137e2b7d7aa9220b2
-#+zstd.78d52b3e7f0cfe343a81f7e5932a4469e0ec04d33e415fae0fd5821f099f89ca
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+attr.9aeb8c9aa9b0c58d0bef1fbf3dbbd7edf415f351c5f2aea11e1a0b2cebc70274
+#+zstd.4d0316139a860ab98a38660f734fae196cacdc04bf56f4d45b0a692d06473fe1
 #@untar:-z:sha256:4672b5c47d9418d3a5ae5b243defc6d9eae8275b9771022247c6a6082c815914:.
 
 
diff --git a/variants/root-x86_64/strace b/variants/root-x86_64/strace
@@ -1,40 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+m4.a52b544a61e3d3890392553a1c63a5c3ee7a4c4c5d0c7685ebfb9f828a3ef2bf
-#+patch.f96ad537c882a1bed9479ea978ccc31fbcbee68a1d18a5deb9003258bc58f2ce
-#+libunwind.22de7440ee54ba74bb45397c7279ccd92069a3084f74c6f1fac8bb35f3c20728
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+m4.4883a41081b9cdff29d76e24ccadd5dea8897716f9e5b20789d7489c2db62170
+#+patch.a7f1a33763eeb4c7728022e5cf4f69c537c12ee97b8de5b76610f2fde144fa84
+#+libunwind.3c24f6c21c3befc6b8e23aafcdb6a73cf070467ed69d0298e80e5ad43898a0a9
 #@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.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-dosfstools.85c86ff0d269d53af70def72a9adddca737d70096043e3720792b02a4f4e25e3
-#+busybox-e2fsprogs.63818428105760e9b1bafb5cc765e3f1e2939ec127a4b08d957df9cde2599466
-#+busybox-iproute2.54ccee32719b2c0bb9f3d6cbd8dfd4c09062bb681af18e3ed994cca45fd330bd
-#+busybox-iputils.64b19952b26879cdbfdd32257e2f486f7d2e8b52f719fa7ec10c8b41552bc9c8
-#+busybox-net-misc.61dc15f76bf37642e30ed621e47337af0eb5719e6ccca24416e3fa979843713f
-#+busybox-net-tools.918e7f0dfb89e5df9c809eef8c061dd19fd4b2ab75625829e7640e44ec5c9463
-#+busybox-traceroute.90e9e1797ab14371f20ebc76a2fff0ba875faceb0f4359c2f4e5ef55df75bb34
-#+busybox-wget.729dd834ffdba7ad76dd914b2dd5352ce58130a0f6b17ccef1097c9dce3d33ad
-#+busybox-chpst.f90fe836f75107df9aff6142c549709370f688fec811797cd72d2b2a01c671a0
-#+busybox-console.d191b9c51818690757189fc5c98999183d51283be01e9446da1554425d025a93
-#+busybox-getty.1a0dfbe78dc9e417c1cdc9773f885d5f05d61535b3f58a3bb8d1b3711fb9a849
-#+busybox-i2c-tools.bd159e2598756b7065567411d22cde9cc72329765d1a32da6a0956442502b403
-#+busybox-linux-extra.57e2dcccfb6b1e2393f5a1dacc6b1dfc71f3c1a9e6dd0fe56b421ff225c17b94
-#+busybox-mtd-utils.664f71e3e7cb1ea13912476516b826db27a0392de13c060685c0f29c49f862ab
-#+busybox-shadow.76d726bbb8df5d6ee42c0f32cd280a91eb94f0949dba7421487dbe4583c90d3a
-#+busybox-su.87c2dfbabec12790378c5feeaab4012a3b98f08ac16fa30c6a064f971c75436b
-#+busybox-util-linux-priv.88f0e5c221f24105bbee2a6e84fcd72481dd39702b0b633b733e81a4b4598ed7
-#+busybox-logging.97c5602ed84ffb239611645e58d0c97a07b505fcefabed885e4f8410e8b282cf
-#+busybox-cron.3afe963ad428f47f2b53382cc62b40f7f168b41d1468061cc5a56a5ecf60d2c7
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+nawk.9ffe9e8ced505282f9526814564a6fbd53b46a34c3c533cdbeb35679a5986805
-#+diffutils.d9f34e8ddf24f4144bb974b8cf3ec0d25454280089f1a6cc514034e19c53ce57
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+aat.a1d2074aa8ce75d0752dd5f6e5b1a9023aa29187ea026bfd2fd6f0dc859ead42
-#+fileset.755f29f3bc7b362e009c824de42787e53900e7d617163071e9e65568bb507090
-#+rsync.a347262d08f314b1669571238a2ce5f1a9863a97936ef2478e418942e81d012a
-#+execline.62309d4bece25d9fd9801a7e9e9e4a97e5a26cc6d8b6ec40f2420ecf0e22a677
-#+kbd.9fd431d31efdbdee2fbb849c2a956dda1cfba25462fe9678b3eeef8e9dbfd2a9
-#+mdevd.6e9888891f75ceebc5a17f6470f3364305c60a4494d0293868155a1041553413
-#+s6-linux-utils.6c4ea4899b9c7e63442a17bd44e9521c5d423e715efb22b7ff5e0754a19c9c66
-#+s6-rc.b8f2a714b1156e4c56c34e3f901f9fe2085d985ba11d47fa019367544a199fb3
-#+s6.e97bd84122cca75a7b68f68889496be7a5609e4a94bfa4a337e2787dcd79fc15
-#+zsh.786b35599b47e5a64e8f64b6853fed96325776545db70e7c5d41d519337e8668
-#+libcgroup.e9007ff39289a1d940cb7e32aff2d0305a28c7b41d63befc038a03630a394743
-#+system-config-scripts.635785445cc9d3cb3fc139e4c4a43ee26c441e85e71dddc01d902827eada5325
-#+logincaps.9609c33a49f14ae8d8d4074fb0918cc8dcc810bb9d6b3eede2ac10cff52a6ea5
-#+busybox-modutils.5083238d2449af949077a8e52c580a887fe1b91c8d10dfc7ef85bea2da6cd77e
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-dosfstools.52bc4ff96892385af5010d7eb2c7b81bd82a92ab8dae9ea9442a1e3907cd2356
+#+busybox-e2fsprogs.4da2840b28884a7ff7eff7d9166e3527b4dfb67a463307259875be056315cdd2
+#+busybox-iproute2.5c4a71bc1015c624bee6630b1d5bb1f0f4b9b5188434d241bd45e9824ca900dc
+#+busybox-iputils.b7cddd6f32d789bbbda1d7debdfa9503d4900bd75f45ab5ed5cc33ccbcaf8d75
+#+busybox-net-misc.856cd9fbdccba7e9270791cbb8f81d16a4b785f2a0a9097619a7c074ea1a7448
+#+busybox-net-tools.c4e96b330fc28c88140911e96462a931fda1ed30165e205b5afa71d86f572392
+#+busybox-traceroute.0599ec936adfdc56c68c19cca030a61efcdddba960b35728c846a0a68467399a
+#+busybox-wget.a0994072aab7d10e281293d288981ef31db5ea77015b6b6b7067fbb0f6d9b6e0
+#+busybox-chpst.35150e3653a1a85065d295d1fd896dd335286b199fdabbabc446b5a50b09f891
+#+busybox-console.9f778c9f338b33f978d8bb48c931f62f2710421ba46e53d08de7e9ae42151162
+#+busybox-getty.5135eca5f521d03c7ba7b4ada57cefdf08c8c3d9a8675895dd2c4037fdd7decf
+#+busybox-i2c-tools.44579eb7f7b4c2c95c69bcc2d8ca205396f86ba12b165852c2b3ed7a3265c6cb
+#+busybox-linux-extra.1f0f5dac6a84f72fa1aa9eb8180743900c431184f578d6a96e3a4c1b665b9f76
+#+busybox-mtd-utils.22f838bd0436ffdfab9749eb2b46b9099fca29651c2e00d0d444aa3e96b72d7b
+#+busybox-shadow.cc8ca5cbc3645e6b024fb0c21ea2b4dc6550796c7e6042ddfd165d42c42623f6
+#+busybox-su.05e8fb55f2e28680baa38aaca217d1e2bd5d0bde513946d919046438121b0512
+#+busybox-util-linux-priv.0267a11624ca9ed5364e0bcf9bbd79769157f3e7e06c1bcba398ce18f20f7e68
+#+busybox-logging.0242130f83cfcc7cd9a18b887b68e875da070e849b7290c19abea7872db21806
+#+busybox-cron.6b6765827e1dc2d52c5c77f024483201b6d381551fd46d6f98406ab3a5c069c2
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+nawk.a45f17510ace9517b9d7c542d513276f0f6ac6b18fa795e3ece69be76dfdcdaa
+#+diffutils.ce1debc080204cf007a72b5cf9cd4f903c3f4f09fd33bf147d5e6ea407f7c1dc
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+aat.b9870a3abed53ba497de03071a0a5143c3358612984bb4e7e844d180aebdd916
+#+fileset.0232f2d41438ab2851bf62f624b72a7f2edb82a5a7cd0b02e3b979210f6c457a
+#+rsync.8c159221c3679d50ecb1a7b9c04ea359be996d8782e37c52004d053ee48a3e91
+#+execline.5597cefe7a3464a1a03ef20a49a1aefb98ada3e016a0c3331ad0023ad8647ec3
+#+kbd.a0bd4d0fbbec14fda0a0098e52b83328d6ed8d660a7eb804ffecf618bceb9273
+#+mdevd.2db7c0c0c9e423e6ff623230e5914f773cc34218128f7fb18e692bea0705c741
+#+s6-linux-utils.2648518f85fa0e88741fde973899a3d4fb5f1d25950f46137badf9ddb861aac7
+#+s6-rc.513e5770c2928ca6ad42de54c31da20cf2ec018e1ea9d47df55b4b48ec0d8849
+#+s6.2fcd8917da46cad0ccaa860ae3f5516dc321f0534f674d390ae62b9c931c67ee
+#+zsh.52c232b069e8cfa3d25529f8680f9b793eb9ecbd805f5f44942c61089e0934a7
+#+libcgroup.a4b1e91982158b3ca11d53f3aadcec528cf15b5d500073dec42566550c186e25
+#+system-config-scripts.4ffa04f1e3653486b569f45b057d3904af2397941838d9e690bb4faa381c9f83
+#+logincaps.1b9a07e5a09d733c71f0891700b95a1e25125ed7ae2e32e23d8bf50fbfb6a000
+#+busybox-modutils.973ad2f4884070b6954640f7db4760a11fe2af81ea77addbb6e6998817e7907c
 #@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.acc00639f7d86e9bce0eb679c1abd7900a24c6e937fd5d1ed532e9db295c2e34' \
-	'pthbs_path_mdevd=/versions/env.8397b36c4121d887921da5276fce9d032cf4522b273657355b92d2f378032cf1' \
+	'pthbs_path_containers=/versions/env.5aa691289d59b482da54a65ae756330061cf9663d825bce51de204422d72d87c' \
+	'pthbs_path_mdevd=/versions/env.c63ccd6cff0ad28b5e8eaf4542a9229da84bafe2faa5dbb796eb1cd39e0e0af2' \
 	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.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-dosfstools.85c86ff0d269d53af70def72a9adddca737d70096043e3720792b02a4f4e25e3
-#+busybox-e2fsprogs.63818428105760e9b1bafb5cc765e3f1e2939ec127a4b08d957df9cde2599466
-#+busybox-iproute2.54ccee32719b2c0bb9f3d6cbd8dfd4c09062bb681af18e3ed994cca45fd330bd
-#+busybox-iputils.64b19952b26879cdbfdd32257e2f486f7d2e8b52f719fa7ec10c8b41552bc9c8
-#+busybox-net-misc.61dc15f76bf37642e30ed621e47337af0eb5719e6ccca24416e3fa979843713f
-#+busybox-net-tools.918e7f0dfb89e5df9c809eef8c061dd19fd4b2ab75625829e7640e44ec5c9463
-#+busybox-traceroute.90e9e1797ab14371f20ebc76a2fff0ba875faceb0f4359c2f4e5ef55df75bb34
-#+busybox-wget.729dd834ffdba7ad76dd914b2dd5352ce58130a0f6b17ccef1097c9dce3d33ad
-#+busybox-chpst.f90fe836f75107df9aff6142c549709370f688fec811797cd72d2b2a01c671a0
-#+busybox-console.d191b9c51818690757189fc5c98999183d51283be01e9446da1554425d025a93
-#+busybox-getty.1a0dfbe78dc9e417c1cdc9773f885d5f05d61535b3f58a3bb8d1b3711fb9a849
-#+busybox-i2c-tools.bd159e2598756b7065567411d22cde9cc72329765d1a32da6a0956442502b403
-#+busybox-linux-extra.57e2dcccfb6b1e2393f5a1dacc6b1dfc71f3c1a9e6dd0fe56b421ff225c17b94
-#+busybox-mtd-utils.664f71e3e7cb1ea13912476516b826db27a0392de13c060685c0f29c49f862ab
-#+busybox-shadow.76d726bbb8df5d6ee42c0f32cd280a91eb94f0949dba7421487dbe4583c90d3a
-#+busybox-su.87c2dfbabec12790378c5feeaab4012a3b98f08ac16fa30c6a064f971c75436b
-#+busybox-util-linux-priv.88f0e5c221f24105bbee2a6e84fcd72481dd39702b0b633b733e81a4b4598ed7
-#+busybox-logging.97c5602ed84ffb239611645e58d0c97a07b505fcefabed885e4f8410e8b282cf
-#+busybox-cron.3afe963ad428f47f2b53382cc62b40f7f168b41d1468061cc5a56a5ecf60d2c7
-#+s6.e97bd84122cca75a7b68f68889496be7a5609e4a94bfa4a337e2787dcd79fc15
-#+s6-rc.b8f2a714b1156e4c56c34e3f901f9fe2085d985ba11d47fa019367544a199fb3
-#+s6-portable-utils.e01a0123c3b6487da8c18c31e7f53ac122bfcde8fccf4b18218793e02fba41ab
-#+s6-linux-init.aaf6b740df984be99b0ce273af5d27a00f70a13ee0405d43c2779a453dd9f51c
-#+execline.62309d4bece25d9fd9801a7e9e9e4a97e5a26cc6d8b6ec40f2420ecf0e22a677
-#+system-config-rc.f568d4697c8904b8f280e02b0796611a6ad10eeb9991302b8dda8af6768f9802
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-dosfstools.52bc4ff96892385af5010d7eb2c7b81bd82a92ab8dae9ea9442a1e3907cd2356
+#+busybox-e2fsprogs.4da2840b28884a7ff7eff7d9166e3527b4dfb67a463307259875be056315cdd2
+#+busybox-iproute2.5c4a71bc1015c624bee6630b1d5bb1f0f4b9b5188434d241bd45e9824ca900dc
+#+busybox-iputils.b7cddd6f32d789bbbda1d7debdfa9503d4900bd75f45ab5ed5cc33ccbcaf8d75
+#+busybox-net-misc.856cd9fbdccba7e9270791cbb8f81d16a4b785f2a0a9097619a7c074ea1a7448
+#+busybox-net-tools.c4e96b330fc28c88140911e96462a931fda1ed30165e205b5afa71d86f572392
+#+busybox-traceroute.0599ec936adfdc56c68c19cca030a61efcdddba960b35728c846a0a68467399a
+#+busybox-wget.a0994072aab7d10e281293d288981ef31db5ea77015b6b6b7067fbb0f6d9b6e0
+#+busybox-chpst.35150e3653a1a85065d295d1fd896dd335286b199fdabbabc446b5a50b09f891
+#+busybox-console.9f778c9f338b33f978d8bb48c931f62f2710421ba46e53d08de7e9ae42151162
+#+busybox-getty.5135eca5f521d03c7ba7b4ada57cefdf08c8c3d9a8675895dd2c4037fdd7decf
+#+busybox-i2c-tools.44579eb7f7b4c2c95c69bcc2d8ca205396f86ba12b165852c2b3ed7a3265c6cb
+#+busybox-linux-extra.1f0f5dac6a84f72fa1aa9eb8180743900c431184f578d6a96e3a4c1b665b9f76
+#+busybox-mtd-utils.22f838bd0436ffdfab9749eb2b46b9099fca29651c2e00d0d444aa3e96b72d7b
+#+busybox-shadow.cc8ca5cbc3645e6b024fb0c21ea2b4dc6550796c7e6042ddfd165d42c42623f6
+#+busybox-su.05e8fb55f2e28680baa38aaca217d1e2bd5d0bde513946d919046438121b0512
+#+busybox-util-linux-priv.0267a11624ca9ed5364e0bcf9bbd79769157f3e7e06c1bcba398ce18f20f7e68
+#+busybox-logging.0242130f83cfcc7cd9a18b887b68e875da070e849b7290c19abea7872db21806
+#+busybox-cron.6b6765827e1dc2d52c5c77f024483201b6d381551fd46d6f98406ab3a5c069c2
+#+s6.2fcd8917da46cad0ccaa860ae3f5516dc321f0534f674d390ae62b9c931c67ee
+#+s6-rc.513e5770c2928ca6ad42de54c31da20cf2ec018e1ea9d47df55b4b48ec0d8849
+#+s6-portable-utils.e7a2584cb9a381e58999865bafb19a4f8cbb6e6c58dd07c6ee9ffa53e5f8e93c
+#+s6-linux-init.9948aac6370c28e4ee27147483d55c130be50baf961501391f24bffdfe120c13
+#+execline.5597cefe7a3464a1a03ef20a49a1aefb98ada3e016a0c3331ad0023ad8647ec3
+#+system-config-rc.dc1da4135d49e17367d9e0a192a8925f57cba106e809f4940beb06cfd4ee23f6
 
 
 # - build script start -
@@ -76,7 +76,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-s6rcdb=/versions/system-config-rc.f568d4697c8904b8f280e02b0796611a6ad10eeb9991302b8dda8af6768f9802/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.dc1da4135d49e17367d9e0a192a8925f57cba106e809f4940beb06cfd4ee23f6/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.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+s6-rc.b8f2a714b1156e4c56c34e3f901f9fe2085d985ba11d47fa019367544a199fb3
-#+fileset.755f29f3bc7b362e009c824de42787e53900e7d617163071e9e65568bb507090
-#+system-config.64665518b92ed155e1d46edf164b50a6b83bc2e733ad4a7667df67ac94474ee3
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+s6-rc.513e5770c2928ca6ad42de54c31da20cf2ec018e1ea9d47df55b4b48ec0d8849
+#+fileset.0232f2d41438ab2851bf62f624b72a7f2edb82a5a7cd0b02e3b979210f6c457a
+#+system-config.831ca9e7a3082e49303a89d56383fbe668c4c404aa5097e34b38e5341cfb86b8
 
 
 # - build script start -
@@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-src=/versions/system-config.64665518b92ed155e1d46edf164b50a6b83bc2e733ad4a7667df67ac94474ee3/config/s6-rc-source
+src=/versions/system-config.831ca9e7a3082e49303a89d56383fbe668c4c404aa5097e34b38e5341cfb86b8/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.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+zsh.786b35599b47e5a64e8f64b6853fed96325776545db70e7c5d41d519337e8668
-#+pthbs-banginstall.e0b92a53563e59c27563cff50c09e7fe23b02ec2b5114f78c7e6cb4902467c48
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+zsh.52c232b069e8cfa3d25529f8680f9b793eb9ecbd805f5f44942c61089e0934a7
+#+pthbs-banginstall.11a4dfa7bbf19f57643e1f71dae30a17ee21b42960bf46b4328cc685c50d8204
 #@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.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+zsh.786b35599b47e5a64e8f64b6853fed96325776545db70e7c5d41d519337e8668
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+zsh.52c232b069e8cfa3d25529f8680f9b793eb9ecbd805f5f44942c61089e0934a7
 #@git:6dfbe33079e2f8c64c5daed29aa1ea3e7e3f2d59:system-config-zsh
 
 
diff --git a/variants/root-x86_64/tinyssh b/variants/root-x86_64/tinyssh
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
 #@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.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+execline.62309d4bece25d9fd9801a7e9e9e4a97e5a26cc6d8b6ec40f2420ecf0e22a677
-#+pthbs-banginstall.e0b92a53563e59c27563cff50c09e7fe23b02ec2b5114f78c7e6cb4902467c48
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+execline.5597cefe7a3464a1a03ef20a49a1aefb98ada3e016a0c3331ad0023ad8647ec3
+#+pthbs-banginstall.11a4dfa7bbf19f57643e1f71dae30a17ee21b42960bf46b4328cc685c50d8204
 #@sha256:664430d033e0b491a5ed90cb39cb17cddb57ac0be9f3f2bf014264f3c17d55df:user-env
 
 
diff --git a/variants/root-x86_64/userspace.environment b/variants/root-x86_64/userspace.environment
@@ -1,93 +1,91 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-dosfstools.85c86ff0d269d53af70def72a9adddca737d70096043e3720792b02a4f4e25e3
-#+busybox-e2fsprogs.63818428105760e9b1bafb5cc765e3f1e2939ec127a4b08d957df9cde2599466
-#+busybox-iproute2.54ccee32719b2c0bb9f3d6cbd8dfd4c09062bb681af18e3ed994cca45fd330bd
-#+busybox-iputils.64b19952b26879cdbfdd32257e2f486f7d2e8b52f719fa7ec10c8b41552bc9c8
-#+busybox-net-misc.61dc15f76bf37642e30ed621e47337af0eb5719e6ccca24416e3fa979843713f
-#+busybox-net-tools.918e7f0dfb89e5df9c809eef8c061dd19fd4b2ab75625829e7640e44ec5c9463
-#+busybox-traceroute.90e9e1797ab14371f20ebc76a2fff0ba875faceb0f4359c2f4e5ef55df75bb34
-#+busybox-wget.729dd834ffdba7ad76dd914b2dd5352ce58130a0f6b17ccef1097c9dce3d33ad
-#+busybox-chpst.f90fe836f75107df9aff6142c549709370f688fec811797cd72d2b2a01c671a0
-#+busybox-console.d191b9c51818690757189fc5c98999183d51283be01e9446da1554425d025a93
-#+busybox-getty.1a0dfbe78dc9e417c1cdc9773f885d5f05d61535b3f58a3bb8d1b3711fb9a849
-#+busybox-i2c-tools.bd159e2598756b7065567411d22cde9cc72329765d1a32da6a0956442502b403
-#+busybox-linux-extra.57e2dcccfb6b1e2393f5a1dacc6b1dfc71f3c1a9e6dd0fe56b421ff225c17b94
-#+busybox-mtd-utils.664f71e3e7cb1ea13912476516b826db27a0392de13c060685c0f29c49f862ab
-#+busybox-shadow.76d726bbb8df5d6ee42c0f32cd280a91eb94f0949dba7421487dbe4583c90d3a
-#+busybox-su.87c2dfbabec12790378c5feeaab4012a3b98f08ac16fa30c6a064f971c75436b
-#+busybox-util-linux-priv.88f0e5c221f24105bbee2a6e84fcd72481dd39702b0b633b733e81a4b4598ed7
-#+busybox-logging.97c5602ed84ffb239611645e58d0c97a07b505fcefabed885e4f8410e8b282cf
-#+busybox-cron.3afe963ad428f47f2b53382cc62b40f7f168b41d1468061cc5a56a5ecf60d2c7
-#+attr.2deab0952c63f4215a9b269dce5c662474dcfbfeed26983137e2b7d7aa9220b2
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+diffutils.d9f34e8ddf24f4144bb974b8cf3ec0d25454280089f1a6cc514034e19c53ce57
-#+patch.f96ad537c882a1bed9479ea978ccc31fbcbee68a1d18a5deb9003258bc58f2ce
-#+flex.e03fc54a9d85f6ca301fd813c1b12ca06cef79c60017ed22db3902e7fa893ff8
-#+bison.133fba3a15fd4cc629aff5dd08c291d476bb7d2ff91b8aeff1b5012cf95709f2
-#+rsync.a347262d08f314b1669571238a2ce5f1a9863a97936ef2478e418942e81d012a
-#+execline.62309d4bece25d9fd9801a7e9e9e4a97e5a26cc6d8b6ec40f2420ecf0e22a677
-#+s6.e97bd84122cca75a7b68f68889496be7a5609e4a94bfa4a337e2787dcd79fc15
-#+s6-rc.b8f2a714b1156e4c56c34e3f901f9fe2085d985ba11d47fa019367544a199fb3
-#+s6-portable-utils.e01a0123c3b6487da8c18c31e7f53ac122bfcde8fccf4b18218793e02fba41ab
-#+s6-linux-utils.6c4ea4899b9c7e63442a17bd44e9521c5d423e715efb22b7ff5e0754a19c9c66
-#+s6-linux-init.aaf6b740df984be99b0ce273af5d27a00f70a13ee0405d43c2779a453dd9f51c
-#+mdevd.6e9888891f75ceebc5a17f6470f3364305c60a4494d0293868155a1041553413
-#+s6-dns.89aa6accc46063e7b805e01921a5e0c65f2030b1a8046587e8eb033ceb4b9eef
-#+libressl.6946b4de4f6a6da96980a9b0e95157a75850c4bf9a93c761c8d6f9ab918c6e7e
-#+s6-networking.e551ae60e43726449e33cdf44ff1ddf90f770bc23ba93fd5b5c847aed64ef889
-#+zsh.786b35599b47e5a64e8f64b6853fed96325776545db70e7c5d41d519337e8668
-#+pthbs-banginstall.e0b92a53563e59c27563cff50c09e7fe23b02ec2b5114f78c7e6cb4902467c48
-#+aat.a1d2074aa8ce75d0752dd5f6e5b1a9023aa29187ea026bfd2fd6f0dc859ead42
-#+confz.020fb08d03a60480ec91080a1433480c88e3da8537eaa57fcc7ab04baf5e9679
-#+containers.9e504637d1f39ca2b432092d6120738fe9a08e5c6c84cc96dc24c4111a291bd8
-#+fileset.755f29f3bc7b362e009c824de42787e53900e7d617163071e9e65568bb507090
-#+logincaps.9609c33a49f14ae8d8d4074fb0918cc8dcc810bb9d6b3eede2ac10cff52a6ea5
-#+snaprep.a8e75c05cf4d610b3cf978089ddabcfe976fc4c95cff56c43d1f460956d6d96d
-#+curl.d3701eb9de92c5486eb085f578e2307e88b00e277fbc12935c7c9a1ff433d5cd
-#+git.99223693863044d4838256f73a937e5754d1fd85031e9bd9fcfd7ca17a200095
-#+xbps.94dbf6e35bf4caf6110fd17386ece2641d49a8c016466c673ce34847c992f030
-#+apk-tools.d7f8ada88ff253d290bcc916be4269b525f2de37bbdde9a30718c364906c3a56
-#+getent.9a5b335a1ae21ec669fb582dfa25a49f824113c551e5ab83f4f1d8b86e335ce4
-#+getconf.0fcd3838a99034e1880560e0bc83f9440df26b175b9c7182cd73cdaf454d229a
-#+iconv.319b9685b72ca6d1af9b6a6d2445146fc117f08acb05801a020618f36ecb8098
-#+libcap.c34b2ea3e798da1b9e2ed6048cbcdbe14de0e34dfe4dddfceb45eeefecbce285
-#+applyuidgid-caps.dfc0c85465799451d6cd64d8fd6a2911b6d010e7a9475e8ee9f1bb37ba4f9051
-#+ccx-utils.cd8e6ae95f0aecc4d3e2d82b89cf18e514d4d8ebd4d6e1692f70b6cae4fee221
-#+user-env.18be8d2cdc61e13707392fc452e4ede5687a91266c37096bf6a84eeaeb391e86
-#+strace.a6c459c53cf0453efb4f7bc62506b49b74c46f4e049f4ce1a6130acb27bd0a93
-#+mlog.23609677a49ced82691b8340351b9328014ab148672875ed8de0af015732f619
-#+findutils.9235c0f4d478927839f78a113dbf379c4ee779fa882679546aeac6cc109a8fa8
-#+nawk.9ffe9e8ced505282f9526814564a6fbd53b46a34c3c533cdbeb35679a5986805
-#+nvi.34ce75ce7c637e538ca4394f5801840de8cca91252a09935ff4fc2eeca822cd6
-#+squashfs-tools.931592b774aacabdab04458258ea46a5390d716be84d2071781e8536a9b838f2
-#+mandoc.07ef5e99caa7867a95017c1ebeaf18cdb9a636488f377aea2f80b843e39c9eeb
-#+tinyssh.47f85a264ef96d7f4601671ba75f3aeee6e6067df54e1ce729e03d73ef921c98-
\ No newline at end of file
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-dosfstools.52bc4ff96892385af5010d7eb2c7b81bd82a92ab8dae9ea9442a1e3907cd2356
+#+busybox-e2fsprogs.4da2840b28884a7ff7eff7d9166e3527b4dfb67a463307259875be056315cdd2
+#+busybox-iproute2.5c4a71bc1015c624bee6630b1d5bb1f0f4b9b5188434d241bd45e9824ca900dc
+#+busybox-iputils.b7cddd6f32d789bbbda1d7debdfa9503d4900bd75f45ab5ed5cc33ccbcaf8d75
+#+busybox-net-misc.856cd9fbdccba7e9270791cbb8f81d16a4b785f2a0a9097619a7c074ea1a7448
+#+busybox-net-tools.c4e96b330fc28c88140911e96462a931fda1ed30165e205b5afa71d86f572392
+#+busybox-traceroute.0599ec936adfdc56c68c19cca030a61efcdddba960b35728c846a0a68467399a
+#+busybox-wget.a0994072aab7d10e281293d288981ef31db5ea77015b6b6b7067fbb0f6d9b6e0
+#+busybox-chpst.35150e3653a1a85065d295d1fd896dd335286b199fdabbabc446b5a50b09f891
+#+busybox-console.9f778c9f338b33f978d8bb48c931f62f2710421ba46e53d08de7e9ae42151162
+#+busybox-getty.5135eca5f521d03c7ba7b4ada57cefdf08c8c3d9a8675895dd2c4037fdd7decf
+#+busybox-i2c-tools.44579eb7f7b4c2c95c69bcc2d8ca205396f86ba12b165852c2b3ed7a3265c6cb
+#+busybox-linux-extra.1f0f5dac6a84f72fa1aa9eb8180743900c431184f578d6a96e3a4c1b665b9f76
+#+busybox-mtd-utils.22f838bd0436ffdfab9749eb2b46b9099fca29651c2e00d0d444aa3e96b72d7b
+#+busybox-shadow.cc8ca5cbc3645e6b024fb0c21ea2b4dc6550796c7e6042ddfd165d42c42623f6
+#+busybox-su.05e8fb55f2e28680baa38aaca217d1e2bd5d0bde513946d919046438121b0512
+#+busybox-util-linux-priv.0267a11624ca9ed5364e0bcf9bbd79769157f3e7e06c1bcba398ce18f20f7e68
+#+busybox-logging.0242130f83cfcc7cd9a18b887b68e875da070e849b7290c19abea7872db21806
+#+busybox-cron.6b6765827e1dc2d52c5c77f024483201b6d381551fd46d6f98406ab3a5c069c2
+#+attr.9aeb8c9aa9b0c58d0bef1fbf3dbbd7edf415f351c5f2aea11e1a0b2cebc70274
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+diffutils.ce1debc080204cf007a72b5cf9cd4f903c3f4f09fd33bf147d5e6ea407f7c1dc
+#+patch.a7f1a33763eeb4c7728022e5cf4f69c537c12ee97b8de5b76610f2fde144fa84
+#+flex.fc0768f60cfea619079286fc2694c1d39541706719fc9aad705a3ef92a4ceea1
+#+bison.7245d2c57021d0f0600acc2ead962c6af431328919c6f4a8edcab37e827e004b
+#+rsync.8c159221c3679d50ecb1a7b9c04ea359be996d8782e37c52004d053ee48a3e91
+#+execline.5597cefe7a3464a1a03ef20a49a1aefb98ada3e016a0c3331ad0023ad8647ec3
+#+s6.2fcd8917da46cad0ccaa860ae3f5516dc321f0534f674d390ae62b9c931c67ee
+#+s6-rc.513e5770c2928ca6ad42de54c31da20cf2ec018e1ea9d47df55b4b48ec0d8849
+#+s6-portable-utils.e7a2584cb9a381e58999865bafb19a4f8cbb6e6c58dd07c6ee9ffa53e5f8e93c
+#+s6-linux-utils.2648518f85fa0e88741fde973899a3d4fb5f1d25950f46137badf9ddb861aac7
+#+s6-linux-init.9948aac6370c28e4ee27147483d55c130be50baf961501391f24bffdfe120c13
+#+mdevd.2db7c0c0c9e423e6ff623230e5914f773cc34218128f7fb18e692bea0705c741
+#+s6-dns.2b4ed643da7bc8ac9b8e8b54524e6ae119654c1556c6a50b46563bfa2895ec70
+#+libressl.737550246c5f7966d58e66007cd0328a5a10af72c47b86189c7bd24d02903b40
+#+s6-networking.7d74f36ef79b1ba8772429fdc2f05609301fe5c26ad5e157163adbb2f06ca5b9
+#+zsh.52c232b069e8cfa3d25529f8680f9b793eb9ecbd805f5f44942c61089e0934a7
+#+pthbs-banginstall.11a4dfa7bbf19f57643e1f71dae30a17ee21b42960bf46b4328cc685c50d8204
+#+aat.b9870a3abed53ba497de03071a0a5143c3358612984bb4e7e844d180aebdd916
+#+confz.cc0c72630acd10cf47efbcb65d6a4be651deaef96771f48d10d08971ae433fe4
+#+containers.ba73dc9d30968138a18779b19cb56427d25c72b7d879b8aff2979c38abae8a1f
+#+fileset.0232f2d41438ab2851bf62f624b72a7f2edb82a5a7cd0b02e3b979210f6c457a
+#+logincaps.1b9a07e5a09d733c71f0891700b95a1e25125ed7ae2e32e23d8bf50fbfb6a000
+#+snaprep.696eae96ddfe992c87aa062c577e02fdf275cb8ecc549f9f3793bb549236ba79
+#+curl.35f09b46cfdbad1dd1e1ec3fdbdc0fce661c4e709181686aa3969f9174c9ba4b
+#+git.54bab6cebd0b9033b19043f937a96f4752f9f9cac0d37d0d59de7a3b4999f75e
+#+xbps.4d1bcc0f5d86a23cc8d4fe9c92793156d8e240bdd59286fe2d9b855c90094be2
+#+apk-tools.e09162294416fd3f716bfad8a2a6c091bb55d6a3e7f9d9ceb98bb383ed08a49f
+#+getent.65cede614db90b83bc90264b4161c6bf1d11df1b708353ea70d783131d45c679
+#+getconf.207e54372f55843e89d07e08eaee256e35497e1f494a95aee306d6c6a38d48d7
+#+iconv.94d8c510ad7362ded029bba04b761d18d101789ec61753b2c3ccc921989d9bdc
+#+libcap.b1ee55e09f1c9a2ed427132f4248421b06264f0c08cf48f042bf87eba98ba842
+#+applyuidgid-caps.6da83209122a58787cec038960dd8f2a41ec7b5a407f8371d7634d8d2085c2a0
+#+ccx-utils.8f56efdd62d14d99fc9afc488e3a725b5fd4e81fd67150277c38c8a069bbf347
+#+user-env.af87eebd39c23dd0d7dd423b558e9ddc4f027f1931250376c19fa1239f563cbc
+#+strace.9ec530dfc82a0ec34ce6cd04983a689e90c3308b402094608954100125454f28
+#+mlog.fc2b33e682d61377e02d4ddfb1623771daa954eb96e0f8ff4a78a0d8006e3016
+#+findutils.3f04076afac7f1f2c5b31951e67a444d1629d9dc6b59bc45406679a23636d16a
+#+nawk.a45f17510ace9517b9d7c542d513276f0f6ac6b18fa795e3ece69be76dfdcdaa
+#+nvi.4c9579da773dab1d52dbba592fbe1de56a8f630b207b8ff07105018d27dd9c44
+#+squashfs-tools.41179ea9c20d9d9e4b1cf60014cb2d44e869cfb0dafd79ae6607ced295b80d99
+#+mandoc.51b3164f88a448135fe40c80cfc23147866e79e84768b99b8a6195cd04194183
+#+tinyssh.9b9d047cdccafa68cc0d24e3b07731694cf16e50d5d6021e7d0cedc8dafa7635+
\ 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.d981629b3fabbd2f7910880914edff4a0335511431c39240d330ab14e251b489-
\ No newline at end of file
+#+linux-qemu-guest.9944bd5f7010cbf739717ebf88996bf732e0d62271abc1d4999dca21e250cb55+
\ No newline at end of file
diff --git a/variants/root-x86_64/xbps b/variants/root-x86_64/xbps
@@ -1,39 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+libarchive.3e096e893fee87b76ae09747b5c822080a625830d641f663c1dd12624a849051
-#+libressl.6946b4de4f6a6da96980a9b0e95157a75850c4bf9a93c761c8d6f9ab918c6e7e
-#+pkgconf-pkg-config.b381deb533d10dae9e9a3d187ee1205dbe64391747ad636cc313962048ac103b
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+libarchive.8c285119194bd9035dfc0f8d900cb21fe80d32d792e2559f1cab8dc56fdaf573
+#+libressl.737550246c5f7966d58e66007cd0328a5a10af72c47b86189c7bd24d02903b40
+#+pkgconf-pkg-config.ca7cc47c4b1a0e7593e5ce1c40ebf06089a3dd467090441266545e3804dc4883
 #@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:.
 
 
diff --git a/variants/root-x86_64/zsh b/variants/root-x86_64/zsh
@@ -1,40 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+m4.a52b544a61e3d3890392553a1c63a5c3ee7a4c4c5d0c7685ebfb9f828a3ef2bf
-#+netbsd-curses.13fe55dba92600b0b78807aede98bb38e2260ff6d1bcad927a7e403175db9bf6
-#+libbsd.740800bcd948335be4d01df14b55284fcbbaca4cbb7c120443b364be151844a1
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+m4.4883a41081b9cdff29d76e24ccadd5dea8897716f9e5b20789d7489c2db62170
+#+netbsd-curses.1f733118533f27a46eace23088df29355c274c551731022adb87ebe952a4a525
+#+libbsd.e3cb5a1d99b4e8b16119fb064f73fafd4ef990c65a18c164372811bcec2d4618
 #@git:c73505cc47870bd09e8e204d98ac5976e0d4cb52:zsh_config
 #@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:.
 
diff --git a/variants/root-x86_64/zstd b/variants/root-x86_64/zstd
@@ -1,37 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f2cb3c6a9f5ef2b9b83e448b2e57aaf8db7ce92e36c76636927e52f3e1863600
-#+busybox-bzip2.ed6772700af3c0e728fd225fd7e253e277a84446c8bb58dd337efd41ef5113cb
-#+busybox-gzip.5125766b5fcdd20b970bb1a68f762a02b82225380b659d5d4d71adbc8abb099b
-#+busybox-lzop.a1386d56252c6c04788fbec224bd3713e2c93013a88b2331e83f3f797a22ed35
-#+busybox-unzip.cfbe568b6f8de0da43f82bd969dc426bfecd7886ef116212945047bbb529f82f
-#+busybox-xz.b4372b46918e94e2670696985265a4d82b89b45e7c8c7e17775c7d9b66da2d30
-#+busybox-cpio.aabb436fd4ee776b0ab4e78e38cb708d80139a1b25b19450fc9a97d616695138
-#+busybox-dpkg.c1e6cd80b3e45758cc6f693e0fc4fe7eb7d8d18439de422a530cce04250c5f86
-#+busybox-rpm.3daf1bc42725275c262e52d01903451df93ad8525a16e3bc5db6b0145e0de28d
-#+busybox-tar.5ccde9327def6b789779f12db242f90ce9a3102e29e5dbfd2d423320f4b715de
-#+busybox-ed.ef4d3cb67d151c507ea77935e51d614a117e9e4ebb2d81d5df387608b32fb6b7
-#+busybox-sed.ca86136cf5098fb70498b2278d8802c52bf445448d182a8e878b66873415cc2c
-#+busybox-vi.456a07818ee4ff01880629d443490a7a5a85feb24efcd569ba30b5e3d9b83c63
-#+busybox-xxd.e63c97333fd88f1591d850fdef153bdfbc460b1775fb6b41e3f6f3e9dd6b3908
-#+busybox-process-extra.e434909482ef484382d359e134642c2307db670cb42424853d633a848575b67d
-#+busybox-procps.490ecc5e9606321c7a4fb1d4a5b2f432373fc859a5ffa4077b604f902ef9f383
-#+busybox-psmisc.026536236edac08b2c6b7ca17f338581562647c6ff7c019bdb06a4ba31b92276
-#+busybox-ash.b42c5b2842a7e9436b7728a3581e97a9005ed6d37cfca9340a21aa0a12d5e568
-#+busybox-bc.3f1ede9574648ee5d57a7851f585df0a10ca4bcbbe891cfaace1c5bf0f6d842a
-#+busybox-coreutils.6f5d8ba1cf46918f46b0a1fb77e56af5716d071fe3b3ee3f5b90fee9311cf929
-#+busybox-coreutils-extra.ebe22dedea49cdf2c37106bceee276051214e3b2b6a2868d56ae21a987d0e647
-#+busybox-daemontools.2bed1e4fed8cfc12f0b1137c28a118ae62bd8f2407215b7fcf6a990655a26f1c
-#+busybox-grep.071ce8cb0b5d6262ea7690927219a922298a60c31f2fa812519dde692ebb9c84
-#+busybox-misc.d50cfa6583f568eb202ed25b6765370bb73aed6527db37fd144ebe970289b3b7
-#+busybox-sh.7cbfd4b000ca1681a981f257eaba970cfc9e26ae0300ac58d36d2332c4217e0c
-#+busybox-util-linux-unpriv.af2c9ad71e1ff206a00831aa3050f48eead1025eed19ab76ff4e3aad953df177
-#+busybox-findutils.82a19abadc2290c5c15a18d7953addf0b1e20340fea9c96962ff8b59f3ac9cae
-#+busybox-awk.77f69baaedc5f6bd0b8abbc726a0f629534d141e15d95e7a807229523648f9a5
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.bd7b72bf13631364fd753869138cf76e97eec61f49931d4cebb3b25aa08c990f
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.de90f42957be3a1b9bf459c7ac886e7c1ead1421666b49cca4d9b5067666830c
-#+busybox-diffutils.503c8e0696d801af8fbe85f62a1a7feae210bf0ff102de94bbe4fc498e152e4c
+#+busybox.8aa1e0262ff3e13aa81d72c0f3ebfe3517464ae1bc25cf7017b8213d14191771
+#+busybox-bzip2.f09b05155fc6edc052185c22342520f56a953c292674f90950e640072f34ec22
+#+busybox-gzip.c7f3ac26cd937fb8ba0dff743608fbc9428caa4ed3cda09ccc8327fc712f2e4a
+#+busybox-lzop.5160b91a2e80aa8daaea5c4bb4621bfdeec14b6875904d958affa6cc619270a9
+#+busybox-unzip.7cc8c1c5ae14ae13971d7f63f0f44794e8c189358efee5fa5d8a26fb1644067d
+#+busybox-xz.dfec517b2ac34b44eccf30d8b7e712ce4162127a022ff8f234cd8af0eecea5f0
+#+busybox-cpio.3b2d99ea01f39ef4308f0bc21a63ec5f7ad68174cbbb2bcf32adbd222506b4cb
+#+busybox-dpkg.e254ece5a0287773eb14c4269bd06f8b92d1e74e7cd0a8631e4e3b1eb994bb68
+#+busybox-rpm.1c32b0fe14ab6b791dd7da3b855b7d88dfb0cf2124e9ccefe6b77b48497a5921
+#+busybox-tar.492b622e3b49881f840b4df5549a780023f0c37b170caea33f805652103b9ad2
+#+busybox-ed.cf9472e39ba27e4464ca3d684e97bc23962cae8655396e1f7762ac56f9eb2f9a
+#+busybox-sed.c942b418488d6b51afc0bdf9529df69ec47cb007d2124f6d5dfa777478e45101
+#+busybox-vi.955ff4f00af4fd18b0980c615b5a9000bcc8db1da510a841db6ba8c1bfaac690
+#+busybox-xxd.25f3ccdcdc17459b1cb7a612678c100d6bf6d64407ab852c7853bdd423254279
+#+busybox-process-extra.d74d302afb2e786007cf5fb1f54ee2a5b499e18abca55b829ad355886fa02ced
+#+busybox-procps.2b4462a50241249e5038e3b0710f4efabb0fb64de8919ec4aa26e65cb9e0b288
+#+busybox-psmisc.96cbc8d5b63ccf8b694d5c21fd6cb49091102d2000b179d4475b6625f74afe0c
+#+busybox-ash.0c12476601beb7b7a5fb3308c95c12eb86fe09ceff162bf767bdd97f7b5a328d
+#+busybox-bc.8b128b64fc2fbf51c4e0924f796f4110f4cf54ac9277b668e0ecf54781765a9a
+#+busybox-coreutils.9311ae522ea7de07471362c7cb67abebfc58e36d6c077df7e2aedb3d77d5b795
+#+busybox-coreutils-extra.3e93128501764e7d0cbb20b0168fd5791871733ac2a9106d516d276d952d4807
+#+busybox-daemontools.3697374738cc137925bde31365aa5f81301aa93ed8b94731130aa5d115fb5cc7
+#+busybox-grep.7606f062e89ec4af72597df0ff245471aaebd96bcb36f9fabd92ed887c94e332
+#+busybox-misc.af85efe1edae836ba1ee0a0be49cc004af3a24bb1d7e41718df1c2598f5a363a
+#+busybox-sh.b86854e46835c977b1116b297b3133cc324c706efad6b78963ffecb7b2fb4362
+#+busybox-util-linux-unpriv.bfe98ba96238f202c962a3f241088f88916bb05d70cdfef312f99282d9134454
+#+busybox-findutils.3c1aaa1ebe5fca308fb041039781ba40db6ba5aaa4fe6e5f2a033c4fe24beab6
+#+busybox-awk.f762db46bd499878e86c2fa4c78784e8d908911b2b28e9aa794c2d4afbf24fc1
+#+musl-cross-make.2ab5093bf4ec769d6e7681900ae8c74d64f6ee0a867cefc6e634e51483bb4cf8
+#+gnu-make.70a1e5b0999c2fadf39972eb11990e14f3e785e98d93dce8fc5b548d0800893f
+#+busybox-diffutils.4011b3cf2f13b73dba65db61f16ee3940df8950cb96e13f91f785d3d2b263cc0
 #@untar:-z:sha256:98e9c3d949d1b924e28e01eccb7deed865eefebf25c2f21c702e5cd5b63b85e1:.