gcc - mrrl - Minimal Reliable Reproducible Linux

commit a106059daa13f52f1371131fdad1569da9ad5f78
parent 13bf247197296bcc587b89e7ed41edb661cda375
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Fri,  5 Dec 2025 04:57:52 +0000

gcc

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

341 files changed, 7505 insertions(+), 7839 deletions(-)
diff --git a/templates/package_sets b/templates/package_sets
@@ -19,12 +19,12 @@
 {%- endmacro %}
 
 {% macro toolchain() -%}
-{#-
 #+{{pkg_install_name("musl-cross-make:old")}}
--#}
+{#-
 #+{{pkg_install_name("musl")}}
 #+{{pkg_install_name("gcc")}}
 #+{{pkg_install_name("binutils")}}
+-#}
 {%- endmacro %}
 
 {% macro busybox_compress() -%}
diff --git a/templates/pkg/musl-cross-make:old b/templates/pkg/musl-cross-make:old
@@ -64,9 +64,9 @@ for linkname in "$dd"'/{{triplet}}/lib/'ld-musl-*so*; do
 done
 
 # Validate the compiler
-"$dd"'/bin/{{triplet}}-gcc' --version
-"$dd"'/bin/{{triplet}}-gcc' -o true true.c
-"$dd"'/bin/{{triplet}}-readelf' --string-dump=.interp true >true.linker
+"$dd"'/command/{{triplet}}-gcc' --version
+"$dd"'/command/{{triplet}}-gcc' -o true true.c
+"$dd"'/command/{{triplet}}-readelf' --string-dump=.interp true >true.linker
 grep -F "$pthbs_package" true.linker
 
 pkgs="gmp mpc mpfr zlib"
@@ -93,7 +93,7 @@ printf '%s\n' > "$dd/library/pkgconfig/zlib.pc" \
 
 
 # validate zlib
-"$dd"'/bin/{{triplet}}-gcc' -I"$dd/include" -L"$dd/lib" -static -o zpipe zpipe.c -lz
+"$dd"'/command/{{triplet}}-gcc' -I"$dd/include" -L"$dd/lib" -static -o zpipe zpipe.c -lz
 ./zpipe <true.c >true.c.gz
 ./zpipe -d <true.c.gz >true.c.2
 cmp -s true.c true.c.2
diff --git a/templates/pkg/musl-cross-make:oldbootstrap-1 b/templates/pkg/musl-cross-make:oldbootstrap-1
@@ -65,9 +65,9 @@ for linkname in "${pthbs_destdir%/}"'{{versions}}/'"$pthbs_package"'/{{triplet}}
 done
 
 # Validate the compiler
-"${pthbs_destdir%/}"'{{versions}}'"/$pthbs_package/bin/"'{{triplet}}-gcc' --version
-"${pthbs_destdir%/}"'{{versions}}'"/$pthbs_package/bin/"'{{triplet}}-gcc' -o true true.c
-"${pthbs_destdir%/}"'{{versions}}'"/$pthbs_package/bin/"'{{triplet}}-readelf' --string-dump=.interp true >true.linker
+"$dest/command/"'{{triplet}}-gcc' --version
+"$dest/command/"'{{triplet}}-gcc' -o true true.c
+"$dest/command/"'{{triplet}}-readelf' --string-dump=.interp true >true.linker
 grep -F "$pthbs_package" true.linker
 
 
diff --git a/templates/pkg/toolchain.environment b/templates/pkg/toolchain.environment
@@ -0,0 +1,4 @@
+#!/usr/bin/env pthbs-build
+#+{{pkg_install_name("musl")}}
+#+{{pkg_install_name("gcc")}}
+#+{{pkg_install_name("binutils")}}
diff --git a/variants/ccx-x86_64/aat b/variants/ccx-x86_64/aat
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+zsh.90597dd1d8fe6717e07eb26ad736cdf611ce750252fd3339e5f0c2a58a8cf497
-#+pthbs-banginstall.8dfc859346ef41972e22d44f2e3702eef0a29209e17bdd324e1c0fc46ed98c2e
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+zsh.92e0cd3c6ca1613b06de7e3cc3d31a8cb1939757b6af7c8d5d268c139a861bd6
+#+pthbs-banginstall.72ccb0bd87c499a76481aad1c328a420191befb263be9bf0bb17b827e6aa8ca6
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+patch.1e18582a339e228c44c333e8fe5e673fec1cc277cfdc756cb8b7582855184a14
-#+libressl.9bb98ac5f3b2f7f0d13d3ad47144ab754d4ae4eb5054cdbd0c53cd8430d75f3c
-#+zstd.2fad9c24062df52192bc619283c01c794028f831b9a005c0bdd8f2c18fbbd856
-#+pkgconf-pkg-config.2e9d10c7f76b599549416535a5a954360de6d72e83325e765e8e87ba09a1e5bd
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+patch.ea64352f820d24d1dadb99419df4729331bf853f8f8456ababa17bba53761a70
+#+libressl.29616f3b1231a76497df505bc1e977386d4370a00f49cbe58d03ea6b5ac7d1ce
+#+zstd.6e435e3b5a056c983e980d3cf83c4f182db1760e947af71f6dd4702e539d97d9
+#+pkgconf-pkg-config.649101966a931efbc37a3a66a1b67ef5491d924efe224643176452041e4584d7
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+skalibs.1a9f2dcab5ebb24215378af695c819a23c735875b5a9acc0d37372400765ec7b
-#+libcap.3e1e66c3e2134bcfc34177ecc0bf7e79f1327cadcb2664d3a25a7a4464e3f63c
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+skalibs.b25d0c78a58e3ae7d3a422e1142b30b67aa641c67ffff8db5d941ef31209ceb5
+#+libcap.5f1555d9d3876bf9c61303962861320d5546cea71a6e3578779de18b0e717dbb
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+m4.f9b2fbfe5dcb1c1bff8d7996333a9477f89931cd93b3b72a7d9d8fac4637746c
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+m4.ce5c949ddb16f3270907b044c9aa1d9441a41305256efa8f95332955db555e51
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+m4.f9b2fbfe5dcb1c1bff8d7996333a9477f89931cd93b3b72a7d9d8fac4637746c
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+m4.ce5c949ddb16f3270907b044c9aa1d9441a41305256efa8f95332955db555e51
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+m4.f9b2fbfe5dcb1c1bff8d7996333a9477f89931cd93b3b72a7d9d8fac4637746c
-#+flex.1a06937ef4535d1c53a570e6211eef846b6f1f1d94aeda79733a9b3aea61208d
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+m4.ce5c949ddb16f3270907b044c9aa1d9441a41305256efa8f95332955db555e51
+#+flex.e9b2dbbd6977615d0e14d817adccfb842774fe78b6e561fe0201bc930bf6643c
 #@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.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
 #+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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
 
 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.eb1e90061c3a29d4b6a6c2abc33fe8adb86d4e0774ec76bde90df614fcf8d48a
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+busybox.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
+#+linux-qemu-guest.39ede5e4e149867aae9536deda9c7842678b57a33337402467f1ebe10c541899
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
 #@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.eb1e90061c3a29d4b6a6c2abc33fe8adb86d4e0774ec76bde90df614fcf8d48a"
+CONFIG_DEFAULT_MODULES_DIR="/home/ccx/versions/linux-qemu-guest.39ede5e4e149867aae9536deda9c7842678b57a33337402467f1ebe10c541899"
 EOF
 make oldconfig
 cat .config
diff --git a/variants/ccx-x86_64/busybox:old b/variants/ccx-x86_64/busybox:old
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.b30fd5b7c961fff18271b301c05c03e168a8c832133a996fa270fec71a5cf768
-#+gnu-make.42012c9161943f38bef21b9ce00a30576de83eb642f72f2e93269f9d034ee14b
-#+busybox.980c2821c3cd4d68975fa24e491fff3b352be7db6725344849a7443b84b3e819
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.70b59502f0ecc5608ccb5cde06e01572d522d8b4a4325daea556d6a12ad2ae20
+#+busybox.0cb717b44cf7cb9067ff6fa757e1487862365640034e97bf719e1f8f689b882b
 #@sha256:31b8f61d2173fa36d4409e8e91f52088691d6ba4db13efe19ea7ae7512e64275:busybox/.config
 #@git:3621595939e43a831d66f6b757d4f410029bff95:busybox
 
diff --git a/variants/ccx-x86_64/busybox:oldbootstrap b/variants/ccx-x86_64/busybox:oldbootstrap
@@ -1,13 +1,13 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
 #@pragma:nopath
-#+musl-cross-make.cb1dda53f3f2c6dcc6c4ae3e33670c01847c9f4e5dd1219df9dbab56b5f01cce
-#+gnu-make.42012c9161943f38bef21b9ce00a30576de83eb642f72f2e93269f9d034ee14b
+#+musl-cross-make.2f63fe1ffce685929408aad19eb570f3700781f70f740ddca34e79c01ca48c65
+#+gnu-make.70b59502f0ecc5608ccb5cde06e01572d522d8b4a4325daea556d6a12ad2ae20
 #@git:aa4d303a3139107919f73cece4eaf85a7dc75db6:busybox
 #@sha256:9ee52091d7a41e7e492d508574573fbebe64155d85a07980128f21105eaad1e2:busybox/.config
 
-mcm=/home/ccx/versions/musl-cross-make.cb1dda53f3f2c6dcc6c4ae3e33670c01847c9f4e5dd1219df9dbab56b5f01cce
-make=/home/ccx/versions/gnu-make.42012c9161943f38bef21b9ce00a30576de83eb642f72f2e93269f9d034ee14b
+mcm=/home/ccx/versions/musl-cross-make.2f63fe1ffce685929408aad19eb570f3700781f70f740ddca34e79c01ca48c65
+make=/home/ccx/versions/gnu-make.70b59502f0ecc5608ccb5cde06e01572d522d8b4a4325daea556d6a12ad2ae20
 
 export PATH="$mcm/bin:$make/command:$PATH"
 export CC="$mcm/bin/x86_64-linux-musl-gcc"
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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+certdata2pem.2fdeff040a45f352602005517eba70496479670c4119d27815a993bd216700d1
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+certdata2pem.63a724088f2e2f2af7253a4778f9f91205e6591f08bb3b96af2dc8cb712a8497
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+skalibs.1a9f2dcab5ebb24215378af695c819a23c735875b5a9acc0d37372400765ec7b
-#+s6.126793508d107794bfe8577d1a3fad3ee62e27222a633245465df1340f0f5823
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+skalibs.b25d0c78a58e3ae7d3a422e1142b30b67aa641c67ffff8db5d941ef31209ceb5
+#+s6.bc72d08c75a6e415c23c92aed330651f49f979b2cb1a35a70d8ad6d193b219b0
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+zsh.90597dd1d8fe6717e07eb26ad736cdf611ce750252fd3339e5f0c2a58a8cf497
-#+pthbs-banginstall.8dfc859346ef41972e22d44f2e3702eef0a29209e17bdd324e1c0fc46ed98c2e
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+zsh.92e0cd3c6ca1613b06de7e3cc3d31a8cb1939757b6af7c8d5d268c139a861bd6
+#+pthbs-banginstall.72ccb0bd87c499a76481aad1c328a420191befb263be9bf0bb17b827e6aa8ca6
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-dosfstools.483f5bc791395406c4368f142a6af4cc2b947b8449505bfd9b993269e5e9f3ef
-#+busybox-e2fsprogs.ee57e3f1442e8a543f44ae41e1cf943c5e93a75938606096dced6d99f05a5ee1
-#+busybox-iproute2.c71c1905f5b22b859fb7cd763a23acdcd10919919642a5179b7fa1197539f0c6
-#+busybox-iputils.4f16d30f02a967c2507a48726a6accaa55e965a9fa0c1bb609859df0d0f2497f
-#+busybox-net-misc.8f9746687e4623d45c245fa2417517d295a6823fc685d2d0fb9cb997ced8f0fa
-#+busybox-net-tools.fb48cfb533e92e38af1cca4bf48239cc94c8bac3774323956c52b0d2bfea2214
-#+busybox-traceroute.53dc7c7fb92781f3230ecba7bf131e2a0e1b2ebbe9653af41ae2086a4fdc413a
-#+busybox-wget.2259b80152084e3d874240847cceb24e7e932c6738e9cbc7ac6db732dcb57da8
-#+busybox-chpst.c2f6206d421d3cbb25beff29a281896c2bc7a9cea89b4286d74cef036f58bba7
-#+busybox-console.8ed8342d6a410a7400d05131311db499e61fc78ef0b869848e273a25fd33d092
-#+busybox-getty.f12c757d92239ea0c654f858ee3b969a98dce7ca3d7e00e57e6917f00cc159b8
-#+busybox-i2c-tools.6f2ad4f2d996b06ab4c829d4887b40df3acba9c4f8058f8c75a3d799f9703452
-#+busybox-linux-extra.56d236d7f921227908f0bfa3078e4bec4381e7fe48e9276e17abbb1c11d3ea50
-#+busybox-mtd-utils.1468d491bb5710fd259bedb4716e25e8aaef2373eb0e24ab547377d490fb411c
-#+busybox-shadow.783d79257927c81ecea506d73e56f6fbf0b78213d69389327f03431f1b7dd2d5
-#+busybox-su.81d2097abc8cd164cc8b27ef94dc2027a2faf0100e561a0a75573edb83e525b6
-#+busybox-util-linux-priv.a78e11456d5b6f3d65b33024d94e0ab874168ee09597ba9bb0dd314216d15569
-#+busybox-logging.0a58c1598c49d42fff88552bd4da6231d690e9551ef8c99f106faddce3b6f395
-#+busybox-cron.0cb7fd3615f11de0f012aec2a8a98548a9ef7fc61c9565fe51c470a28de8e7b7
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-login.154123d8699d02bbe86751ce02b76a5101890bb3fab7f9cf3dbf6e66e0a43203
-#+execline.c74d67fcb3e8c5df31d31928abb5bff6d408f3668c7f90f83835e88c13ab8d75
-#+s6.126793508d107794bfe8577d1a3fad3ee62e27222a633245465df1340f0f5823
-#+ccx-utils.fcde5ec2b8c9b8033b27a5d5a9861d3651a3d946f15cecd310dede6dfe918949
-#+applyuidgid-caps.f96c2673c35845624d229daf71c745c73863e9685c4e69f9044a2275bdfdc8c3
-#+easyseccomp.08e5003d4da6256c9429f0c9cefc66df8a71d4f769000559898ebb8b884e495a
-#+mlog.2c437ba777c7a750705df88a3bb6049aadd9831703ccbd798bcbd38fcad8f390
-#+abduco.2742c8d73ba6b5eb5f4457224490ec8261e7e07d14c5ba798dd168a4f349a33b
-#+nawk.fa3a319e708ba615cea1b327b59011ccf01440eb19c8296ad754949f6dd0fe9f
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-dosfstools.1346324ba64928a546bd9ac5055f1c1ef3b70802c4ff893fdb0f09af3b763ef9
+#+busybox-e2fsprogs.ebdd30884d8f3ee772f9a7c830ec4d7d74abb76f886b7bd9616dfb7a06a57b3e
+#+busybox-iproute2.275e617e37bf212b8ec39c85bce56624c2a3664b364038a9ab09405adaae264d
+#+busybox-iputils.653daf9d0f1404b14ba7840bcc781123b144c2247e4c0aa62c6ee969e8f3b8d4
+#+busybox-net-misc.931c6c0424442edc909513373538d848a1370283b47a1df9e978276a570bd9bf
+#+busybox-net-tools.a33d2c612b8f40522d13835eae807a6683dff6d82151e04aa8a612156d5d4ccd
+#+busybox-traceroute.bc9aa2ba46b44d59785440d3ed81f2fc607dbe3fe64c280d1542f6b6830b55bd
+#+busybox-wget.47bc24dfd8887fb5f2f263adc35ddeea0e86452c95978d735ee242b760b863f1
+#+busybox-chpst.03c895e0e1320cbe1f784b43ddd8bb157a50ad9d0789661d4df8ab1e65c6af65
+#+busybox-console.4088ade3a3ec63ca41d68b45da13a2436dd9a4514a3aff8bb33533251999cb4c
+#+busybox-getty.3591ee3af405a3d60d57663f7cbcc5c9b8bef588bc0c50e33f240f7893139828
+#+busybox-i2c-tools.5f98c086ca9b85b58403233f9c25471b25abef1435412fb9632122d3a4b3fc28
+#+busybox-linux-extra.446fc73242ba2d0403c92727123091a27e1fe6827bf7bd3f64b3ca7a18d38073
+#+busybox-mtd-utils.94764e0475afd2b86ab6059367fe63ffee7d06ad542ffb24625a021fc1c6347c
+#+busybox-shadow.c48166d15ab615b62a7b1ec7ccccc14ea8d16ac7008991be030025dcdceb4004
+#+busybox-su.c904ae34bc11e8d4dc6d8e2b1bba284699b633dac60f4204915fdcb52a8a7c5e
+#+busybox-util-linux-priv.85a48e38d9652f0aa9bab84318bf2f2098b978100da481556ac7cadcedacc2d3
+#+busybox-logging.ad629aedc4a1e52f6626b977f41241dcf816999e0ab70f4c55f6bb110a426b24
+#+busybox-cron.fbe883c04f089bbd0feeef2b880f4594c7c9662cc8d854b6db725bf4b6725bcd
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-login.cbfbd852202a24e9c7ad8064d598d4a6ea7ca05b7942b007e22212763239451c
+#+execline.d1173f1d6b9c503c39bdf1f64572e46d4409211d577432338ddcbf377c05145d
+#+s6.bc72d08c75a6e415c23c92aed330651f49f979b2cb1a35a70d8ad6d193b219b0
+#+ccx-utils.c1307f49d3eaa7384d15e2223d593802050a305f9b827e260dfd38c8955af26f
+#+applyuidgid-caps.12daf988ea7db38558721928ad01f478a92ab73ce990fde2326eae3452670b83
+#+easyseccomp.49df22a62f3b872427a54736f1a304c9ccd2a7b19d27c16f0b655556bf17107d
+#+mlog.380b007a3966644de12f7e47647e9b531bd2346250f3c2d36e72eb09692464d8
+#+abduco.f43ef14d43679dc94ef5a4241bba977e5d983012bb1d571e8f09e54e273406dc
+#+nawk.b9c1f0cbd523998e24724d9e951dfad1e638c5361fc93c29076e42e964c4acd8
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+zsh.90597dd1d8fe6717e07eb26ad736cdf611ce750252fd3339e5f0c2a58a8cf497
-#+pthbs-banginstall.8dfc859346ef41972e22d44f2e3702eef0a29209e17bdd324e1c0fc46ed98c2e
-#+execline.c74d67fcb3e8c5df31d31928abb5bff6d408f3668c7f90f83835e88c13ab8d75
-#+alpine-keys.1503a6474e4d6a258e87b52f44323923c96a4ebf4fd345440492ffcab51e3bf8
-#+apk-tools.22c760b03bb82973f79c5cc5256347c4b9ab45d8a43c7697e0150f288f0d4f2c
-#+xbps.da28d960e0ded265b5885f25de302531ba4bed623d36fe1b34648ed37b1756ed
-#+container-bin-image.bf1b6ad421bd517373ff86dc65bd5e1a4244521d836c3da96626b8777d261153
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+zsh.92e0cd3c6ca1613b06de7e3cc3d31a8cb1939757b6af7c8d5d268c139a861bd6
+#+pthbs-banginstall.72ccb0bd87c499a76481aad1c328a420191befb263be9bf0bb17b827e6aa8ca6
+#+execline.d1173f1d6b9c503c39bdf1f64572e46d4409211d577432338ddcbf377c05145d
+#+alpine-keys.52107d4fdc9228ee53878a69a69f5912b7a2bde1e354f6d16ee135d759ed06a2
+#+apk-tools.97e9a9204db2ec8639621204c1372b9547378dce6d4bf6c15d758a8493ab5969
+#+xbps.b9295697b82372f5bdc1666c58e47334e46c62ab429c916869355c3d39c943b5
+#+container-bin-image.7f2a64c72d39b96e23d95232a378bb0bce96b821cd9a2cf05dbf4b3ee2eb6fd6
 #@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.22c760b03bb82973f79c5cc5256347c4b9ab45d8a43c7697e0150f288f0d4f2c/command/apk.static' "${dest}/deps/command/"
-ln -sf '/home/ccx/versions/xbps.da28d960e0ded265b5885f25de302531ba4bed623d36fe1b34648ed37b1756ed/command/xbps-install.static' "${dest}/deps/command/"
+ln -sf '/home/ccx/versions/apk-tools.97e9a9204db2ec8639621204c1372b9547378dce6d4bf6c15d758a8493ab5969/command/apk.static' "${dest}/deps/command/"
+ln -sf '/home/ccx/versions/xbps.b9295697b82372f5bdc1666c58e47334e46c62ab429c916869355c3d39c943b5/command/xbps-install.static' "${dest}/deps/command/"
 
-for f in '/home/ccx/versions/alpine-keys.1503a6474e4d6a258e87b52f44323923c96a4ebf4fd345440492ffcab51e3bf8'/keys/alpine/*/*; do
+for f in '/home/ccx/versions/alpine-keys.52107d4fdc9228ee53878a69a69f5912b7a2bde1e354f6d16ee135d759ed06a2'/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.1503a6474e4d6a258e87b52f44323923c96a4eb
 done
  
 mkdir -p "${dest}/deps/keys/void"
-for f in '/home/ccx/versions/xbps.da28d960e0ded265b5885f25de302531ba4bed623d36fe1b34648ed37b1756ed'/keys/void/*; do
+for f in '/home/ccx/versions/xbps.b9295697b82372f5bdc1666c58e47334e46c62ab429c916869355c3d39c943b5'/keys/void/*; do
 	ln -sf "$f" "${dest}/deps/keys/void/"
 done
 
-test -d '/home/ccx/versions/container-bin-image.bf1b6ad421bd517373ff86dc65bd5e1a4244521d836c3da96626b8777d261153/container-bin-image'
-test -f '/home/ccx/versions/container-bin-image.bf1b6ad421bd517373ff86dc65bd5e1a4244521d836c3da96626b8777d261153/container-bin-image/if'
-ln -sf '/home/ccx/versions/container-bin-image.bf1b6ad421bd517373ff86dc65bd5e1a4244521d836c3da96626b8777d261153/container-bin-image' "${dest}/deps/"
+test -d '/home/ccx/versions/container-bin-image.7f2a64c72d39b96e23d95232a378bb0bce96b821cd9a2cf05dbf4b3ee2eb6fd6/container-bin-image'
+test -f '/home/ccx/versions/container-bin-image.7f2a64c72d39b96e23d95232a378bb0bce96b821cd9a2cf05dbf4b3ee2eb6fd6/container-bin-image/if'
+ln -sf '/home/ccx/versions/container-bin-image.7f2a64c72d39b96e23d95232a378bb0bce96b821cd9a2cf05dbf4b3ee2eb6fd6/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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-dosfstools.483f5bc791395406c4368f142a6af4cc2b947b8449505bfd9b993269e5e9f3ef
-#+busybox-e2fsprogs.ee57e3f1442e8a543f44ae41e1cf943c5e93a75938606096dced6d99f05a5ee1
-#+busybox-iproute2.c71c1905f5b22b859fb7cd763a23acdcd10919919642a5179b7fa1197539f0c6
-#+busybox-iputils.4f16d30f02a967c2507a48726a6accaa55e965a9fa0c1bb609859df0d0f2497f
-#+busybox-net-misc.8f9746687e4623d45c245fa2417517d295a6823fc685d2d0fb9cb997ced8f0fa
-#+busybox-net-tools.fb48cfb533e92e38af1cca4bf48239cc94c8bac3774323956c52b0d2bfea2214
-#+busybox-traceroute.53dc7c7fb92781f3230ecba7bf131e2a0e1b2ebbe9653af41ae2086a4fdc413a
-#+busybox-wget.2259b80152084e3d874240847cceb24e7e932c6738e9cbc7ac6db732dcb57da8
-#+busybox-chpst.c2f6206d421d3cbb25beff29a281896c2bc7a9cea89b4286d74cef036f58bba7
-#+busybox-console.8ed8342d6a410a7400d05131311db499e61fc78ef0b869848e273a25fd33d092
-#+busybox-getty.f12c757d92239ea0c654f858ee3b969a98dce7ca3d7e00e57e6917f00cc159b8
-#+busybox-i2c-tools.6f2ad4f2d996b06ab4c829d4887b40df3acba9c4f8058f8c75a3d799f9703452
-#+busybox-linux-extra.56d236d7f921227908f0bfa3078e4bec4381e7fe48e9276e17abbb1c11d3ea50
-#+busybox-mtd-utils.1468d491bb5710fd259bedb4716e25e8aaef2373eb0e24ab547377d490fb411c
-#+busybox-shadow.783d79257927c81ecea506d73e56f6fbf0b78213d69389327f03431f1b7dd2d5
-#+busybox-su.81d2097abc8cd164cc8b27ef94dc2027a2faf0100e561a0a75573edb83e525b6
-#+busybox-util-linux-priv.a78e11456d5b6f3d65b33024d94e0ab874168ee09597ba9bb0dd314216d15569
-#+busybox-logging.0a58c1598c49d42fff88552bd4da6231d690e9551ef8c99f106faddce3b6f395
-#+busybox-cron.0cb7fd3615f11de0f012aec2a8a98548a9ef7fc61c9565fe51c470a28de8e7b7
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+execline.c74d67fcb3e8c5df31d31928abb5bff6d408f3668c7f90f83835e88c13ab8d75
-#+s6.126793508d107794bfe8577d1a3fad3ee62e27222a633245465df1340f0f5823
-#+s6-portable-utils.bbb7e293358143db2ea13ac9e770dabce1c1c68441c580e0f131f2783e699490
-#+s6-linux-utils.3180e2da74f789508e931691e17303463f46a3d5fd76037920c25085c1c3b82f
-#+zsh.90597dd1d8fe6717e07eb26ad736cdf611ce750252fd3339e5f0c2a58a8cf497
-#+confz.2dbf7af32919548c394e8fbd369e140edbb95541b4bb0408733cd9b4db091aa8
-#+containers.08b087a142714adf8c15f69e72e2d4c17a4d3934b25c2d8955272179b54bcad2
-#+xbps.da28d960e0ded265b5885f25de302531ba4bed623d36fe1b34648ed37b1756ed
-#+zstd.2fad9c24062df52192bc619283c01c794028f831b9a005c0bdd8f2c18fbbd856
-#+apk-tools.22c760b03bb82973f79c5cc5256347c4b9ab45d8a43c7697e0150f288f0d4f2c
-#+alpine-keys.1503a6474e4d6a258e87b52f44323923c96a4ebf4fd345440492ffcab51e3bf8
-#+getent.a7db0ccfa535f63ece97aba9549bdb04f4515e00287c685d359caa2b196c7b45
-#+fileset.2ace7fb29784e313f4dc2b83fa4125d1d0bcc73a8a5f33c164ad2fc8119dd9f4
-#+ccx-utils.fcde5ec2b8c9b8033b27a5d5a9861d3651a3d946f15cecd310dede6dfe918949
-#+easyseccomp.08e5003d4da6256c9429f0c9cefc66df8a71d4f769000559898ebb8b884e495a
-#+findutils.72e365d624cffa984e3b0150fffe0d4a37c6372cf8c9acb31cfdfb82207c366f
-#+nawk.fa3a319e708ba615cea1b327b59011ccf01440eb19c8296ad754949f6dd0fe9f-
\ No newline at end of file
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-dosfstools.1346324ba64928a546bd9ac5055f1c1ef3b70802c4ff893fdb0f09af3b763ef9
+#+busybox-e2fsprogs.ebdd30884d8f3ee772f9a7c830ec4d7d74abb76f886b7bd9616dfb7a06a57b3e
+#+busybox-iproute2.275e617e37bf212b8ec39c85bce56624c2a3664b364038a9ab09405adaae264d
+#+busybox-iputils.653daf9d0f1404b14ba7840bcc781123b144c2247e4c0aa62c6ee969e8f3b8d4
+#+busybox-net-misc.931c6c0424442edc909513373538d848a1370283b47a1df9e978276a570bd9bf
+#+busybox-net-tools.a33d2c612b8f40522d13835eae807a6683dff6d82151e04aa8a612156d5d4ccd
+#+busybox-traceroute.bc9aa2ba46b44d59785440d3ed81f2fc607dbe3fe64c280d1542f6b6830b55bd
+#+busybox-wget.47bc24dfd8887fb5f2f263adc35ddeea0e86452c95978d735ee242b760b863f1
+#+busybox-chpst.03c895e0e1320cbe1f784b43ddd8bb157a50ad9d0789661d4df8ab1e65c6af65
+#+busybox-console.4088ade3a3ec63ca41d68b45da13a2436dd9a4514a3aff8bb33533251999cb4c
+#+busybox-getty.3591ee3af405a3d60d57663f7cbcc5c9b8bef588bc0c50e33f240f7893139828
+#+busybox-i2c-tools.5f98c086ca9b85b58403233f9c25471b25abef1435412fb9632122d3a4b3fc28
+#+busybox-linux-extra.446fc73242ba2d0403c92727123091a27e1fe6827bf7bd3f64b3ca7a18d38073
+#+busybox-mtd-utils.94764e0475afd2b86ab6059367fe63ffee7d06ad542ffb24625a021fc1c6347c
+#+busybox-shadow.c48166d15ab615b62a7b1ec7ccccc14ea8d16ac7008991be030025dcdceb4004
+#+busybox-su.c904ae34bc11e8d4dc6d8e2b1bba284699b633dac60f4204915fdcb52a8a7c5e
+#+busybox-util-linux-priv.85a48e38d9652f0aa9bab84318bf2f2098b978100da481556ac7cadcedacc2d3
+#+busybox-logging.ad629aedc4a1e52f6626b977f41241dcf816999e0ab70f4c55f6bb110a426b24
+#+busybox-cron.fbe883c04f089bbd0feeef2b880f4594c7c9662cc8d854b6db725bf4b6725bcd
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+execline.d1173f1d6b9c503c39bdf1f64572e46d4409211d577432338ddcbf377c05145d
+#+s6.bc72d08c75a6e415c23c92aed330651f49f979b2cb1a35a70d8ad6d193b219b0
+#+s6-portable-utils.695ede508f04e899bd2c525709d1c5c7c33fad886a189ccd268aee79b364b35a
+#+s6-linux-utils.d34d12046d9953826bbd5c60ac5261829cf3399c51b9eb2efb959c54533527f1
+#+zsh.92e0cd3c6ca1613b06de7e3cc3d31a8cb1939757b6af7c8d5d268c139a861bd6
+#+confz.5bf78df9a4bf16334fa685fd53a6a32fe8227dbe8648d5b6e65834e39e65fac2
+#+containers.f855f903440b941f07475a8e753b32a0917feb9dd8bd67064c06373de2c729b1
+#+xbps.b9295697b82372f5bdc1666c58e47334e46c62ab429c916869355c3d39c943b5
+#+zstd.6e435e3b5a056c983e980d3cf83c4f182db1760e947af71f6dd4702e539d97d9
+#+apk-tools.97e9a9204db2ec8639621204c1372b9547378dce6d4bf6c15d758a8493ab5969
+#+alpine-keys.52107d4fdc9228ee53878a69a69f5912b7a2bde1e354f6d16ee135d759ed06a2
+#+getent.c3991c80f77c3256e0920bde235a7480c9fc1f8e7de687b0ba9d8cbcc160f736
+#+fileset.94a27bf5ea9bd2b7dabaf7b82e0da867f58fd12cdf3986352e57507eb1390ec3
+#+ccx-utils.c1307f49d3eaa7384d15e2223d593802050a305f9b827e260dfd38c8955af26f
+#+easyseccomp.49df22a62f3b872427a54736f1a304c9ccd2a7b19d27c16f0b655556bf17107d
+#+findutils.cf8d24f48a56e0b345b17c3e74ac179b59056795e32be68564cb224d2c0d010e
+#+nawk.b9c1f0cbd523998e24724d9e951dfad1e638c5361fc93c29076e42e964c4acd8+
\ 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+m4.f9b2fbfe5dcb1c1bff8d7996333a9477f89931cd93b3b72a7d9d8fac4637746c
-#+libressl.9bb98ac5f3b2f7f0d13d3ad47144ab754d4ae4eb5054cdbd0c53cd8430d75f3c
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+m4.ce5c949ddb16f3270907b044c9aa1d9441a41305256efa8f95332955db555e51
+#+libressl.29616f3b1231a76497df505bc1e977386d4370a00f49cbe58d03ea6b5ac7d1ce
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-dosfstools.483f5bc791395406c4368f142a6af4cc2b947b8449505bfd9b993269e5e9f3ef
-#+busybox-e2fsprogs.ee57e3f1442e8a543f44ae41e1cf943c5e93a75938606096dced6d99f05a5ee1
-#+busybox-iproute2.c71c1905f5b22b859fb7cd763a23acdcd10919919642a5179b7fa1197539f0c6
-#+busybox-iputils.4f16d30f02a967c2507a48726a6accaa55e965a9fa0c1bb609859df0d0f2497f
-#+busybox-net-misc.8f9746687e4623d45c245fa2417517d295a6823fc685d2d0fb9cb997ced8f0fa
-#+busybox-net-tools.fb48cfb533e92e38af1cca4bf48239cc94c8bac3774323956c52b0d2bfea2214
-#+busybox-traceroute.53dc7c7fb92781f3230ecba7bf131e2a0e1b2ebbe9653af41ae2086a4fdc413a
-#+busybox-wget.2259b80152084e3d874240847cceb24e7e932c6738e9cbc7ac6db732dcb57da8
-#+busybox-chpst.c2f6206d421d3cbb25beff29a281896c2bc7a9cea89b4286d74cef036f58bba7
-#+busybox-console.8ed8342d6a410a7400d05131311db499e61fc78ef0b869848e273a25fd33d092
-#+busybox-getty.f12c757d92239ea0c654f858ee3b969a98dce7ca3d7e00e57e6917f00cc159b8
-#+busybox-i2c-tools.6f2ad4f2d996b06ab4c829d4887b40df3acba9c4f8058f8c75a3d799f9703452
-#+busybox-linux-extra.56d236d7f921227908f0bfa3078e4bec4381e7fe48e9276e17abbb1c11d3ea50
-#+busybox-mtd-utils.1468d491bb5710fd259bedb4716e25e8aaef2373eb0e24ab547377d490fb411c
-#+busybox-shadow.783d79257927c81ecea506d73e56f6fbf0b78213d69389327f03431f1b7dd2d5
-#+busybox-su.81d2097abc8cd164cc8b27ef94dc2027a2faf0100e561a0a75573edb83e525b6
-#+busybox-util-linux-priv.a78e11456d5b6f3d65b33024d94e0ab874168ee09597ba9bb0dd314216d15569
-#+busybox-logging.0a58c1598c49d42fff88552bd4da6231d690e9551ef8c99f106faddce3b6f395
-#+busybox-cron.0cb7fd3615f11de0f012aec2a8a98548a9ef7fc61c9565fe51c470a28de8e7b7
-#+attr.d204bb80bf61529b59d348ca3803f8927ff0ea3e87da60dcd15983b5060587f4
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+diffutils.53a5ebd33a6c5213495e2d633b8807c250c4b0436fc9bb981c38b2c23196f29b
-#+patch.1e18582a339e228c44c333e8fe5e673fec1cc277cfdc756cb8b7582855184a14
-#+flex.1a06937ef4535d1c53a570e6211eef846b6f1f1d94aeda79733a9b3aea61208d
-#+bison.53ad5d8cd8308bc9731fbbfdf6a9de7d074c82cd022a7e1f80b42c525257dfe7
-#+rsync.137034f429b295a367f144b53f01f4e12f8ae301a1e7d83e1604e8b20bf4832a
-#+execline.c74d67fcb3e8c5df31d31928abb5bff6d408f3668c7f90f83835e88c13ab8d75
-#+s6.126793508d107794bfe8577d1a3fad3ee62e27222a633245465df1340f0f5823
-#+s6-rc.02a2d73c17ade5330667433eb7023da33c683260fe1987c98f06b7701ebd4e40
-#+s6-portable-utils.bbb7e293358143db2ea13ac9e770dabce1c1c68441c580e0f131f2783e699490
-#+s6-linux-utils.3180e2da74f789508e931691e17303463f46a3d5fd76037920c25085c1c3b82f
-#+s6-linux-init.8ca5e2fc3fc64cdfe51fab732d41e7e026520097e4069ab5c78c01e9f42efdbe
-#+mdevd.cb8c2120054601849e38e00b0e17895df189c29161e816bd750b9401ce1b5e36
-#+s6-dns.59cae072cf0a672e10ba0d3af582fa46ef0c5a62801008e74dd914fe6b1a8bae
-#+libressl.9bb98ac5f3b2f7f0d13d3ad47144ab754d4ae4eb5054cdbd0c53cd8430d75f3c
-#+s6-networking.1fead68720f00389d629e5ab5854bc6caa67bfd9563442166b9f9b2f8db2d997
-#+zsh.90597dd1d8fe6717e07eb26ad736cdf611ce750252fd3339e5f0c2a58a8cf497
-#+pthbs-banginstall.8dfc859346ef41972e22d44f2e3702eef0a29209e17bdd324e1c0fc46ed98c2e
-#+aat.b5f223c46d05396b285e8334bb45cce6cb9f662a89eb733807f85820b12d275a
-#+confz.2dbf7af32919548c394e8fbd369e140edbb95541b4bb0408733cd9b4db091aa8
-#+containers.08b087a142714adf8c15f69e72e2d4c17a4d3934b25c2d8955272179b54bcad2
-#+fileset.2ace7fb29784e313f4dc2b83fa4125d1d0bcc73a8a5f33c164ad2fc8119dd9f4
-#+logincaps.929cb8df900637cc090705444ebf02290361ca88bb077ed866df68c2fbb61408
-#+snaprep.8d18cdcaa76a79b1ba661cd20b579f35ab167b1901e03702a2a74c414d006eb8
-#+curl.8a746038e1271f57cb3b2b13f6f117e52754a923e9c011c7c072a82b8b505900
-#+git.5b00b85bef8734fde3733a6940e81f3b5a7b8319011224d8bc75b2cde44433bf
-#+xbps.da28d960e0ded265b5885f25de302531ba4bed623d36fe1b34648ed37b1756ed
-#+apk-tools.22c760b03bb82973f79c5cc5256347c4b9ab45d8a43c7697e0150f288f0d4f2c
-#+getent.a7db0ccfa535f63ece97aba9549bdb04f4515e00287c685d359caa2b196c7b45
-#+getconf.8a0ba3ae885e5d50ecfa2325883f22f98feb0604101d5fb1fee86eaf0280535f
-#+iconv.0afb759181872edb80870b58de5bb3aa3b565500139d401f1a7028b7968a30dd
-#+libcap.3e1e66c3e2134bcfc34177ecc0bf7e79f1327cadcb2664d3a25a7a4464e3f63c
-#+applyuidgid-caps.f96c2673c35845624d229daf71c745c73863e9685c4e69f9044a2275bdfdc8c3
-#+ccx-utils.fcde5ec2b8c9b8033b27a5d5a9861d3651a3d946f15cecd310dede6dfe918949
-#+user-env.44038282a0b65f6024dbbc43b66dcde6bd113733402f57ddad59d77ff83347b1
-#+strace.95b6d159131ea16d5d672dc4deb09b8f05aa7344923a8f26ec2cb5743d6ae387
-#+mlog.2c437ba777c7a750705df88a3bb6049aadd9831703ccbd798bcbd38fcad8f390
-#+findutils.72e365d624cffa984e3b0150fffe0d4a37c6372cf8c9acb31cfdfb82207c366f
-#+nawk.fa3a319e708ba615cea1b327b59011ccf01440eb19c8296ad754949f6dd0fe9f
-#+nvi.6b9bd5b7270258bc87b1b767099a312c0d49c7eef144388c80ff1e3ed62ee013
-#+squashfs-tools.5aea1ad0e0e717f33138bc6ff16f652bbb2f61067cd2ce44035dd165865a920a
-#+mandoc.5060d2f3fad9c517dcf1e6d4ca71eaa3d4c28a914556204605f814dca42e7117
-#+tinyssh.5371c1147acba94efe20aa81c7084232854daaeeabea142826838c3200145ab4
-#+system-config.6ed3d72471e4bf8553b5baf423c0d9ad64198462e9af284d9fd5f1604b0b1a83
-#+system-config-rc.9dcb83b853ce9ee19f7497d6b2026fac8834018c94f1cce8a8b4e5ec419aaae0
-#+system-config-scripts.5d0d1940c8dc9124405c2b5bb59ccb45db6c355d0b87365fb32e90ef946f0dcf
-#+system-config-init.f3882bc2db21906b300bae7163eefe01869c0bcb786af5cb9d4619a91660fcc7
-#+system-config-zsh.94a95ccbe2f8099cdb811ab32a3b2624c816b206c50275cb3673dc9041231cc1
-#+busybox.cca6bdd43beecab0677e6c76f83173341b3c1b25c3b8d82588944f81c9c51466-
\ No newline at end of file
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-dosfstools.1346324ba64928a546bd9ac5055f1c1ef3b70802c4ff893fdb0f09af3b763ef9
+#+busybox-e2fsprogs.ebdd30884d8f3ee772f9a7c830ec4d7d74abb76f886b7bd9616dfb7a06a57b3e
+#+busybox-iproute2.275e617e37bf212b8ec39c85bce56624c2a3664b364038a9ab09405adaae264d
+#+busybox-iputils.653daf9d0f1404b14ba7840bcc781123b144c2247e4c0aa62c6ee969e8f3b8d4
+#+busybox-net-misc.931c6c0424442edc909513373538d848a1370283b47a1df9e978276a570bd9bf
+#+busybox-net-tools.a33d2c612b8f40522d13835eae807a6683dff6d82151e04aa8a612156d5d4ccd
+#+busybox-traceroute.bc9aa2ba46b44d59785440d3ed81f2fc607dbe3fe64c280d1542f6b6830b55bd
+#+busybox-wget.47bc24dfd8887fb5f2f263adc35ddeea0e86452c95978d735ee242b760b863f1
+#+busybox-chpst.03c895e0e1320cbe1f784b43ddd8bb157a50ad9d0789661d4df8ab1e65c6af65
+#+busybox-console.4088ade3a3ec63ca41d68b45da13a2436dd9a4514a3aff8bb33533251999cb4c
+#+busybox-getty.3591ee3af405a3d60d57663f7cbcc5c9b8bef588bc0c50e33f240f7893139828
+#+busybox-i2c-tools.5f98c086ca9b85b58403233f9c25471b25abef1435412fb9632122d3a4b3fc28
+#+busybox-linux-extra.446fc73242ba2d0403c92727123091a27e1fe6827bf7bd3f64b3ca7a18d38073
+#+busybox-mtd-utils.94764e0475afd2b86ab6059367fe63ffee7d06ad542ffb24625a021fc1c6347c
+#+busybox-shadow.c48166d15ab615b62a7b1ec7ccccc14ea8d16ac7008991be030025dcdceb4004
+#+busybox-su.c904ae34bc11e8d4dc6d8e2b1bba284699b633dac60f4204915fdcb52a8a7c5e
+#+busybox-util-linux-priv.85a48e38d9652f0aa9bab84318bf2f2098b978100da481556ac7cadcedacc2d3
+#+busybox-logging.ad629aedc4a1e52f6626b977f41241dcf816999e0ab70f4c55f6bb110a426b24
+#+busybox-cron.fbe883c04f089bbd0feeef2b880f4594c7c9662cc8d854b6db725bf4b6725bcd
+#+attr.0dcc626b099c772eca39d1153c15b37543b5546538555195d29742eafc32d56a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+diffutils.3eee2e19774b5195e35e0d8d725832bd1a6e0676505154642edc6c656983d48b
+#+patch.ea64352f820d24d1dadb99419df4729331bf853f8f8456ababa17bba53761a70
+#+flex.e9b2dbbd6977615d0e14d817adccfb842774fe78b6e561fe0201bc930bf6643c
+#+bison.74d96290385c947d867923bf3fbe15e75990583876f7f280db218771852c63ee
+#+rsync.aaaecca924785d6a6e1a8df7805c0ee29ec44f63434ead863fdf1c9e62f91090
+#+execline.d1173f1d6b9c503c39bdf1f64572e46d4409211d577432338ddcbf377c05145d
+#+s6.bc72d08c75a6e415c23c92aed330651f49f979b2cb1a35a70d8ad6d193b219b0
+#+s6-rc.e51920af4a54aa1cf9db8e4910644f950d4e45d0b00d94eefe19bb713721adb5
+#+s6-portable-utils.695ede508f04e899bd2c525709d1c5c7c33fad886a189ccd268aee79b364b35a
+#+s6-linux-utils.d34d12046d9953826bbd5c60ac5261829cf3399c51b9eb2efb959c54533527f1
+#+s6-linux-init.d274584f1011f8587db4f49c5d632567e09e70256895408b60941310b3cb207e
+#+mdevd.aa9364e677d9f8ccc78d774a82c50c14bcd7942c831785ed0d4c9b09ff1113a8
+#+s6-dns.55f6f468259a0d730745d851f28ed9d0acb72e63303bbd1e81e87c2e43890cba
+#+libressl.29616f3b1231a76497df505bc1e977386d4370a00f49cbe58d03ea6b5ac7d1ce
+#+s6-networking.65035451fb55178a31a6a751a0b64c138c8af952eddb605445e5ea1ce28f1e24
+#+zsh.92e0cd3c6ca1613b06de7e3cc3d31a8cb1939757b6af7c8d5d268c139a861bd6
+#+pthbs-banginstall.72ccb0bd87c499a76481aad1c328a420191befb263be9bf0bb17b827e6aa8ca6
+#+aat.a5e24520225807f566ef10f001ef0d46125d7baffcf991120925d280cfec4867
+#+confz.5bf78df9a4bf16334fa685fd53a6a32fe8227dbe8648d5b6e65834e39e65fac2
+#+containers.f855f903440b941f07475a8e753b32a0917feb9dd8bd67064c06373de2c729b1
+#+fileset.94a27bf5ea9bd2b7dabaf7b82e0da867f58fd12cdf3986352e57507eb1390ec3
+#+logincaps.91840d47a64d12d4b4f724d9fd2b2e7446c7ac3696cd25faf2673664293bd408
+#+snaprep.acd7599a6ff35bafb1406c9b314069fc662be777be0eed098394223f58384327
+#+curl.868a0f8e2ac114eca9f0294c3726d45c1dbfbf503792f888b5f4b1eebe161119
+#+git.7faa6517dae786aa5c8ba62c6c0baf7e404d6d7a5853f0719f6b0f4d3d2ba62b
+#+xbps.b9295697b82372f5bdc1666c58e47334e46c62ab429c916869355c3d39c943b5
+#+apk-tools.97e9a9204db2ec8639621204c1372b9547378dce6d4bf6c15d758a8493ab5969
+#+getent.c3991c80f77c3256e0920bde235a7480c9fc1f8e7de687b0ba9d8cbcc160f736
+#+getconf.c026a1310708f63a014f655316c6de232ab07ceaaaf44e29961f933eaa93b359
+#+iconv.027052011b7d69848afc88307f8d13de668dc85090b0c9621d72354ad964b7c9
+#+libcap.5f1555d9d3876bf9c61303962861320d5546cea71a6e3578779de18b0e717dbb
+#+applyuidgid-caps.12daf988ea7db38558721928ad01f478a92ab73ce990fde2326eae3452670b83
+#+ccx-utils.c1307f49d3eaa7384d15e2223d593802050a305f9b827e260dfd38c8955af26f
+#+user-env.a69597bb779def38655c07dd0be8c2c7372c10b635298b4e839230a53484386b
+#+strace.1aea094fc5d71f8db44b5675cba24ac415231370ef59ae4a5232285cbfde8bf6
+#+mlog.380b007a3966644de12f7e47647e9b531bd2346250f3c2d36e72eb09692464d8
+#+findutils.cf8d24f48a56e0b345b17c3e74ac179b59056795e32be68564cb224d2c0d010e
+#+nawk.b9c1f0cbd523998e24724d9e951dfad1e638c5361fc93c29076e42e964c4acd8
+#+nvi.87664d4b59207baebb77663a484828594a39b5ae11af0745c63c4c5438e82c3f
+#+squashfs-tools.6ec71a7c83e35620a37a9da6809195c37f3cdb1ca213dcf4039351bd6ae4ceaa
+#+mandoc.3470b7cb75b1989703d26bfcdcb226ca478e986f7dcc6df1054b49ac81c3107d
+#+tinyssh.ee02b830050fd1fe59a2b9f9e6c02a7c8bfbd3b2eb4a34d9e9bda6614fc9c88f
+#+system-config.2cae00742681b8d6c0ebd019856fbee6377c17aeed8be3f56f3b031645548e58
+#+system-config-rc.3e9471a5f817bd51ee9c5d7efb43bee5e74d67e86d2e8f0074dafa6c3703a209
+#+system-config-scripts.51bc431b013e3828fc0ea1472e5a41999b3e741cc8d604244e9cbe1dbf548149
+#+system-config-init.1f61c2c244be2c6bacc72ba9223e5b6c24d41bdb8b9aa6a405b26327a5c4b75e
+#+system-config-zsh.d59521a396a25317c5fad211a7a0e55d4a91b6604bea19b451d96d2995ba0d69
+#+busybox.97232e51769ad578af205cffdd8e30c208306d2ca9e61cfb02222399f03470c4+
\ 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+m4.f9b2fbfe5dcb1c1bff8d7996333a9477f89931cd93b3b72a7d9d8fac4637746c
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+m4.ce5c949ddb16f3270907b044c9aa1d9441a41305256efa8f95332955db555e51
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.1264825203acf9e03d40d7e3cf1cc29f5d9a9744d97343bc4c5ab19ec49ade19
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+ocaml.9c3907adfbbbf4cfe511cb6b968a86b43bf85a7fbed175da44c6feecd7639faf
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+m4.f9b2fbfe5dcb1c1bff8d7996333a9477f89931cd93b3b72a7d9d8fac4637746c
-#+patch.1e18582a339e228c44c333e8fe5e673fec1cc277cfdc756cb8b7582855184a14
-#+flex.1a06937ef4535d1c53a570e6211eef846b6f1f1d94aeda79733a9b3aea61208d
-#+bison.53ad5d8cd8308bc9731fbbfdf6a9de7d074c82cd022a7e1f80b42c525257dfe7
-#+libseccomp.69b035bcb27272111d199995174effbc471bbf6d3784f594c60595839334bf4e
-#+error-standalone.8b76ed8044df7dd8d8cfe5744b190c966d01697efdbffba1cf84547576e97783
-#+argp-standalone.5504dad0513503a05640ea7fcb61bf524282805b039040600f63c64fe447b5e4
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+m4.ce5c949ddb16f3270907b044c9aa1d9441a41305256efa8f95332955db555e51
+#+patch.ea64352f820d24d1dadb99419df4729331bf853f8f8456ababa17bba53761a70
+#+flex.e9b2dbbd6977615d0e14d817adccfb842774fe78b6e561fe0201bc930bf6643c
+#+bison.74d96290385c947d867923bf3fbe15e75990583876f7f280db218771852c63ee
+#+libseccomp.8f952ae2015d9f0cb869c4c0c0bcad844e9bf24b2cc37dedf3773e144422804c
+#+error-standalone.e388a8cdad1c10a865263e5106ba8ef85ca5c23c0d6db9b43041acb794552edf
+#+argp-standalone.07c7d90bfd17ce1436fb480a1113e98ee22ab480073d3f9e9ea3dd939b3f683e
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+skalibs.1a9f2dcab5ebb24215378af695c819a23c735875b5a9acc0d37372400765ec7b
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+skalibs.b25d0c78a58e3ae7d3a422e1142b30b67aa641c67ffff8db5d941ef31209ceb5
 #@git:6c0957eb5e8eea2ffada4d7be08286f0e81d0527:execline
 
 
@@ -48,7 +46,7 @@ cd 'execline'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.1a9f2dcab5ebb24215378af695c819a23c735875b5a9acc0d37372400765ec7b/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.b25d0c78a58e3ae7d3a422e1142b30b67aa641c67ffff8db5d941ef31209ceb5/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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+zsh.90597dd1d8fe6717e07eb26ad736cdf611ce750252fd3339e5f0c2a58a8cf497
-#+pthbs-banginstall.8dfc859346ef41972e22d44f2e3702eef0a29209e17bdd324e1c0fc46ed98c2e
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+zsh.92e0cd3c6ca1613b06de7e3cc3d31a8cb1939757b6af7c8d5d268c139a861bd6
+#+pthbs-banginstall.72ccb0bd87c499a76481aad1c328a420191befb263be9bf0bb17b827e6aa8ca6
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+m4.f9b2fbfe5dcb1c1bff8d7996333a9477f89931cd93b3b72a7d9d8fac4637746c
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+m4.ce5c949ddb16f3270907b044c9aa1d9441a41305256efa8f95332955db555e51
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+m4.f9b2fbfe5dcb1c1bff8d7996333a9477f89931cd93b3b72a7d9d8fac4637746c
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+m4.ce5c949ddb16f3270907b044c9aa1d9441a41305256efa8f95332955db555e51
 #@untar:-z:sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995:.
 
 
diff --git a/variants/ccx-x86_64/getconf b/variants/ccx-x86_64/getconf
@@ -1,35 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+m4.f9b2fbfe5dcb1c1bff8d7996333a9477f89931cd93b3b72a7d9d8fac4637746c
-#+libressl.9bb98ac5f3b2f7f0d13d3ad47144ab754d4ae4eb5054cdbd0c53cd8430d75f3c
-#+curl.8a746038e1271f57cb3b2b13f6f117e52754a923e9c011c7c072a82b8b505900
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+m4.ce5c949ddb16f3270907b044c9aa1d9441a41305256efa8f95332955db555e51
+#+libressl.29616f3b1231a76497df505bc1e977386d4370a00f49cbe58d03ea6b5ac7d1ce
+#+curl.868a0f8e2ac114eca9f0294c3726d45c1dbfbf503792f888b5f4b1eebe161119
 #@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.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
 #+gnu-make.14802bec28edc645ca1a7a23446f40dab46713a04ef11560c6ad30dedc6501d1
 #+busybox.aeeb1578e53d136819626c28a985e31bfcde1c17ee87ebd250d7f4dd0e800b22
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
diff --git a/variants/ccx-x86_64/gnu-make:old b/variants/ccx-x86_64/gnu-make:old
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.b30fd5b7c961fff18271b301c05c03e168a8c832133a996fa270fec71a5cf768
-#+gnu-make.42012c9161943f38bef21b9ce00a30576de83eb642f72f2e93269f9d034ee14b
-#+busybox.980c2821c3cd4d68975fa24e491fff3b352be7db6725344849a7443b84b3e819
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.70b59502f0ecc5608ccb5cde06e01572d522d8b4a4325daea556d6a12ad2ae20
+#+busybox.0cb717b44cf7cb9067ff6fa757e1487862365640034e97bf719e1f8f689b882b
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 
diff --git a/variants/ccx-x86_64/gnu-make:oldbootstrap b/variants/ccx-x86_64/gnu-make:oldbootstrap
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
 #@pragma:nopath
-#+musl-cross-make.cb1dda53f3f2c6dcc6c4ae3e33670c01847c9f4e5dd1219df9dbab56b5f01cce
+#+musl-cross-make.2f63fe1ffce685929408aad19eb570f3700781f70f740ddca34e79c01ca48c65
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 
@@ -36,7 +36,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd 'make-4.4.1'
 
 
-mcm=/home/ccx/versions/musl-cross-make.cb1dda53f3f2c6dcc6c4ae3e33670c01847c9f4e5dd1219df9dbab56b5f01cce
+mcm=/home/ccx/versions/musl-cross-make.2f63fe1ffce685929408aad19eb570f3700781f70f740ddca34e79c01ca48c65
 
 export PATH="$mcm/bin:$PATH"
 export CC="$mcm/bin/x86_64-linux-musl-gcc"
diff --git a/variants/ccx-x86_64/gperf b/variants/ccx-x86_64/gperf
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+m4.f9b2fbfe5dcb1c1bff8d7996333a9477f89931cd93b3b72a7d9d8fac4637746c
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+m4.ce5c949ddb16f3270907b044c9aa1d9441a41305256efa8f95332955db555e51
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+m4.f9b2fbfe5dcb1c1bff8d7996333a9477f89931cd93b3b72a7d9d8fac4637746c
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+m4.ce5c949ddb16f3270907b044c9aa1d9441a41305256efa8f95332955db555e51
 #@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.eb1e90061c3a29d4b6a6c2abc33fe8adb86d4e0774ec76bde90df614fcf8d48a
-#+busybox.cca6bdd43beecab0677e6c76f83173341b3c1b25c3b8d82588944f81c9c51466-
\ No newline at end of file
+#+linux-qemu-guest.39ede5e4e149867aae9536deda9c7842678b57a33337402467f1ebe10c541899
+#+busybox.97232e51769ad578af205cffdd8e30c208306d2ca9e61cfb02222399f03470c4+
\ 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+m4.f9b2fbfe5dcb1c1bff8d7996333a9477f89931cd93b3b72a7d9d8fac4637746c
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+m4.ce5c949ddb16f3270907b044c9aa1d9441a41305256efa8f95332955db555e51
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+m4.f9b2fbfe5dcb1c1bff8d7996333a9477f89931cd93b3b72a7d9d8fac4637746c
-#+libmd.c0663190d128e124ffd44b8fbed8bdb25ea0fa4902c066b87adbfcf947538687
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+m4.ce5c949ddb16f3270907b044c9aa1d9441a41305256efa8f95332955db555e51
+#+libmd.2fa8ee477178d41260820f5453b2601b8896617793f06ebbb169db8d452e534a
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+pkgconf-pkg-config.2e9d10c7f76b599549416535a5a954360de6d72e83325e765e8e87ba09a1e5bd
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+pkgconf-pkg-config.649101966a931efbc37a3a66a1b67ef5491d924efe224643176452041e4584d7
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+m4.f9b2fbfe5dcb1c1bff8d7996333a9477f89931cd93b3b72a7d9d8fac4637746c
-#+flex.1a06937ef4535d1c53a570e6211eef846b6f1f1d94aeda79733a9b3aea61208d
-#+bison.53ad5d8cd8308bc9731fbbfdf6a9de7d074c82cd022a7e1f80b42c525257dfe7
-#+musl-fts.e0af8a712e85d43ec62beb978ed2e5ecd2ba1f5650551ed568e2b17635f57208
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+m4.ce5c949ddb16f3270907b044c9aa1d9441a41305256efa8f95332955db555e51
+#+flex.e9b2dbbd6977615d0e14d817adccfb842774fe78b6e561fe0201bc930bf6643c
+#+bison.74d96290385c947d867923bf3fbe15e75990583876f7f280db218771852c63ee
+#+musl-fts.a2f3dff1740b296c81f5d1935dbe754d09d41a931625d6c8d2fd665da65b9f9c
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+zstd.2fad9c24062df52192bc619283c01c794028f831b9a005c0bdd8f2c18fbbd856
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+zstd.6e435e3b5a056c983e980d3cf83c4f182db1760e947af71f6dd4702e539d97d9
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+m4.f9b2fbfe5dcb1c1bff8d7996333a9477f89931cd93b3b72a7d9d8fac4637746c
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+m4.ce5c949ddb16f3270907b044c9aa1d9441a41305256efa8f95332955db555e51
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+m4.f9b2fbfe5dcb1c1bff8d7996333a9477f89931cd93b3b72a7d9d8fac4637746c
-#+ca-certificates-wip-donotuse.46294a1e81817214fc94a3a6acc44ca86d36cdb2bcc9d7abd224566b674cf9fd
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+m4.ce5c949ddb16f3270907b044c9aa1d9441a41305256efa8f95332955db555e51
+#+ca-certificates-wip-donotuse.75ee99ae82d54abf8270a2e671275c13c909975fedf0e319e1c7132f10af6316
 #@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.46294a1e81817214fc94a3a6acc44ca86d36cdb2bcc9d7abd224566b674cf9fd/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/"
+cp -vs '/home/ccx/versions/ca-certificates-wip-donotuse.75ee99ae82d54abf8270a2e671275c13c909975fedf0e319e1c7132f10af6316/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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+m4.f9b2fbfe5dcb1c1bff8d7996333a9477f89931cd93b3b72a7d9d8fac4637746c
-#+pkgconf-pkg-config.2e9d10c7f76b599549416535a5a954360de6d72e83325e765e8e87ba09a1e5bd
-#+gperf.494f6f787fbda5fe8067dd2af573abbe800d66ab9937478d299e3abf293a6ed9
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+m4.ce5c949ddb16f3270907b044c9aa1d9441a41305256efa8f95332955db555e51
+#+pkgconf-pkg-config.649101966a931efbc37a3a66a1b67ef5491d924efe224643176452041e4584d7
+#+gperf.8c18e4f7679122707b773e73e877819dd9e7b53d0b94a0758419f7d599b6a4be
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+m4.f9b2fbfe5dcb1c1bff8d7996333a9477f89931cd93b3b72a7d9d8fac4637746c
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+m4.ce5c949ddb16f3270907b044c9aa1d9441a41305256efa8f95332955db555e51
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-modutils.72a72e37926eb232663cdf69da01f84c07447e88b256841e7daf51bedcd8f389
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+findutils.72e365d624cffa984e3b0150fffe0d4a37c6372cf8c9acb31cfdfb82207c366f
-#+diffutils.53a5ebd33a6c5213495e2d633b8807c250c4b0436fc9bb981c38b2c23196f29b
-#+patch.1e18582a339e228c44c333e8fe5e673fec1cc277cfdc756cb8b7582855184a14
-#+flex.1a06937ef4535d1c53a570e6211eef846b6f1f1d94aeda79733a9b3aea61208d
-#+bison.53ad5d8cd8308bc9731fbbfdf6a9de7d074c82cd022a7e1f80b42c525257dfe7
-#+rsync.137034f429b295a367f144b53f01f4e12f8ae301a1e7d83e1604e8b20bf4832a
-#+zstd.2fad9c24062df52192bc619283c01c794028f831b9a005c0bdd8f2c18fbbd856
-#+libelf.9b104d3662f7d2f77071ebb7f649ed12feb16245f44096c254bf4866cf0a51ce
-#+pkgconf-pkg-config.2e9d10c7f76b599549416535a5a954360de6d72e83325e765e8e87ba09a1e5bd
-#+nawk.fa3a319e708ba615cea1b327b59011ccf01440eb19c8296ad754949f6dd0fe9f
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-modutils.8e93fbc587215cbbe7eb6cba941db625c481a9ab3bd5624df9f5857364de12ab
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+findutils.cf8d24f48a56e0b345b17c3e74ac179b59056795e32be68564cb224d2c0d010e
+#+diffutils.3eee2e19774b5195e35e0d8d725832bd1a6e0676505154642edc6c656983d48b
+#+patch.ea64352f820d24d1dadb99419df4729331bf853f8f8456ababa17bba53761a70
+#+flex.e9b2dbbd6977615d0e14d817adccfb842774fe78b6e561fe0201bc930bf6643c
+#+bison.74d96290385c947d867923bf3fbe15e75990583876f7f280db218771852c63ee
+#+rsync.aaaecca924785d6a6e1a8df7805c0ee29ec44f63434ead863fdf1c9e62f91090
+#+zstd.6e435e3b5a056c983e980d3cf83c4f182db1760e947af71f6dd4702e539d97d9
+#+libelf.6a12ae7be9fd86037edeccd922f5948381f2bc8561318b7c18633101a9c2acd5
+#+pkgconf-pkg-config.649101966a931efbc37a3a66a1b67ef5491d924efe224643176452041e4584d7
+#+nawk.b9c1f0cbd523998e24724d9e951dfad1e638c5361fc93c29076e42e964c4acd8
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-modutils.72a72e37926eb232663cdf69da01f84c07447e88b256841e7daf51bedcd8f389
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+findutils.72e365d624cffa984e3b0150fffe0d4a37c6372cf8c9acb31cfdfb82207c366f
-#+diffutils.53a5ebd33a6c5213495e2d633b8807c250c4b0436fc9bb981c38b2c23196f29b
-#+patch.1e18582a339e228c44c333e8fe5e673fec1cc277cfdc756cb8b7582855184a14
-#+flex.1a06937ef4535d1c53a570e6211eef846b6f1f1d94aeda79733a9b3aea61208d
-#+bison.53ad5d8cd8308bc9731fbbfdf6a9de7d074c82cd022a7e1f80b42c525257dfe7
-#+rsync.137034f429b295a367f144b53f01f4e12f8ae301a1e7d83e1604e8b20bf4832a
-#+zstd.2fad9c24062df52192bc619283c01c794028f831b9a005c0bdd8f2c18fbbd856
-#+libelf.9b104d3662f7d2f77071ebb7f649ed12feb16245f44096c254bf4866cf0a51ce
-#+pkgconf-pkg-config.2e9d10c7f76b599549416535a5a954360de6d72e83325e765e8e87ba09a1e5bd
-#+nawk.fa3a319e708ba615cea1b327b59011ccf01440eb19c8296ad754949f6dd0fe9f
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-modutils.8e93fbc587215cbbe7eb6cba941db625c481a9ab3bd5624df9f5857364de12ab
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+findutils.cf8d24f48a56e0b345b17c3e74ac179b59056795e32be68564cb224d2c0d010e
+#+diffutils.3eee2e19774b5195e35e0d8d725832bd1a6e0676505154642edc6c656983d48b
+#+patch.ea64352f820d24d1dadb99419df4729331bf853f8f8456ababa17bba53761a70
+#+flex.e9b2dbbd6977615d0e14d817adccfb842774fe78b6e561fe0201bc930bf6643c
+#+bison.74d96290385c947d867923bf3fbe15e75990583876f7f280db218771852c63ee
+#+rsync.aaaecca924785d6a6e1a8df7805c0ee29ec44f63434ead863fdf1c9e62f91090
+#+zstd.6e435e3b5a056c983e980d3cf83c4f182db1760e947af71f6dd4702e539d97d9
+#+libelf.6a12ae7be9fd86037edeccd922f5948381f2bc8561318b7c18633101a9c2acd5
+#+pkgconf-pkg-config.649101966a931efbc37a3a66a1b67ef5491d924efe224643176452041e4584d7
+#+nawk.b9c1f0cbd523998e24724d9e951dfad1e638c5361fc93c29076e42e964c4acd8
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+zsh.90597dd1d8fe6717e07eb26ad736cdf611ce750252fd3339e5f0c2a58a8cf497
-#+pthbs-banginstall.8dfc859346ef41972e22d44f2e3702eef0a29209e17bdd324e1c0fc46ed98c2e
-#+execline.c74d67fcb3e8c5df31d31928abb5bff6d408f3668c7f90f83835e88c13ab8d75
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ccx-utils.fcde5ec2b8c9b8033b27a5d5a9861d3651a3d946f15cecd310dede6dfe918949
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+zsh.92e0cd3c6ca1613b06de7e3cc3d31a8cb1939757b6af7c8d5d268c139a861bd6
+#+pthbs-banginstall.72ccb0bd87c499a76481aad1c328a420191befb263be9bf0bb17b827e6aa8ca6
+#+execline.d1173f1d6b9c503c39bdf1f64572e46d4409211d577432338ddcbf377c05145d
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+ccx-utils.c1307f49d3eaa7384d15e2223d593802050a305f9b827e260dfd38c8955af26f
 #@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.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+busybox.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+zsh.90597dd1d8fe6717e07eb26ad736cdf611ce750252fd3339e5f0c2a58a8cf497
-#+pthbs-banginstall.8dfc859346ef41972e22d44f2e3702eef0a29209e17bdd324e1c0fc46ed98c2e
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+zsh.92e0cd3c6ca1613b06de7e3cc3d31a8cb1939757b6af7c8d5d268c139a861bd6
+#+pthbs-banginstall.72ccb0bd87c499a76481aad1c328a420191befb263be9bf0bb17b827e6aa8ca6
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+skalibs.1a9f2dcab5ebb24215378af695c819a23c735875b5a9acc0d37372400765ec7b
-#+execline.c74d67fcb3e8c5df31d31928abb5bff6d408f3668c7f90f83835e88c13ab8d75
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+skalibs.b25d0c78a58e3ae7d3a422e1142b30b67aa641c67ffff8db5d941ef31209ceb5
+#+execline.d1173f1d6b9c503c39bdf1f64572e46d4409211d577432338ddcbf377c05145d
 #@git:96aef400b9f9d14f3bf54b0e444e9ad3665c4107:mdevd
 
 
@@ -49,7 +47,7 @@ cd 'mdevd'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.1a9f2dcab5ebb24215378af695c819a23c735875b5a9acc0d37372400765ec7b/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.b25d0c78a58e3ae7d3a422e1142b30b67aa641c67ffff8db5d941ef31209ceb5/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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-dosfstools.483f5bc791395406c4368f142a6af4cc2b947b8449505bfd9b993269e5e9f3ef
-#+busybox-e2fsprogs.ee57e3f1442e8a543f44ae41e1cf943c5e93a75938606096dced6d99f05a5ee1
-#+busybox-iproute2.c71c1905f5b22b859fb7cd763a23acdcd10919919642a5179b7fa1197539f0c6
-#+busybox-iputils.4f16d30f02a967c2507a48726a6accaa55e965a9fa0c1bb609859df0d0f2497f
-#+busybox-net-misc.8f9746687e4623d45c245fa2417517d295a6823fc685d2d0fb9cb997ced8f0fa
-#+busybox-net-tools.fb48cfb533e92e38af1cca4bf48239cc94c8bac3774323956c52b0d2bfea2214
-#+busybox-traceroute.53dc7c7fb92781f3230ecba7bf131e2a0e1b2ebbe9653af41ae2086a4fdc413a
-#+busybox-wget.2259b80152084e3d874240847cceb24e7e932c6738e9cbc7ac6db732dcb57da8
-#+busybox-chpst.c2f6206d421d3cbb25beff29a281896c2bc7a9cea89b4286d74cef036f58bba7
-#+busybox-console.8ed8342d6a410a7400d05131311db499e61fc78ef0b869848e273a25fd33d092
-#+busybox-getty.f12c757d92239ea0c654f858ee3b969a98dce7ca3d7e00e57e6917f00cc159b8
-#+busybox-i2c-tools.6f2ad4f2d996b06ab4c829d4887b40df3acba9c4f8058f8c75a3d799f9703452
-#+busybox-linux-extra.56d236d7f921227908f0bfa3078e4bec4381e7fe48e9276e17abbb1c11d3ea50
-#+busybox-mtd-utils.1468d491bb5710fd259bedb4716e25e8aaef2373eb0e24ab547377d490fb411c
-#+busybox-shadow.783d79257927c81ecea506d73e56f6fbf0b78213d69389327f03431f1b7dd2d5
-#+busybox-su.81d2097abc8cd164cc8b27ef94dc2027a2faf0100e561a0a75573edb83e525b6
-#+busybox-util-linux-priv.a78e11456d5b6f3d65b33024d94e0ab874168ee09597ba9bb0dd314216d15569
-#+busybox-logging.0a58c1598c49d42fff88552bd4da6231d690e9551ef8c99f106faddce3b6f395
-#+busybox-cron.0cb7fd3615f11de0f012aec2a8a98548a9ef7fc61c9565fe51c470a28de8e7b7
-#+execline.c74d67fcb3e8c5df31d31928abb5bff6d408f3668c7f90f83835e88c13ab8d75
-#+s6.126793508d107794bfe8577d1a3fad3ee62e27222a633245465df1340f0f5823
-#+mdev-scripts.5c7aa7a131714583b2b592f24e1ce3ecdb7b3269a5982630534047712f6a3e34
-#+mdevd.cb8c2120054601849e38e00b0e17895df189c29161e816bd750b9401ce1b5e36
-#+busybox.cca6bdd43beecab0677e6c76f83173341b3c1b25c3b8d82588944f81c9c51466-
\ No newline at end of file
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-dosfstools.1346324ba64928a546bd9ac5055f1c1ef3b70802c4ff893fdb0f09af3b763ef9
+#+busybox-e2fsprogs.ebdd30884d8f3ee772f9a7c830ec4d7d74abb76f886b7bd9616dfb7a06a57b3e
+#+busybox-iproute2.275e617e37bf212b8ec39c85bce56624c2a3664b364038a9ab09405adaae264d
+#+busybox-iputils.653daf9d0f1404b14ba7840bcc781123b144c2247e4c0aa62c6ee969e8f3b8d4
+#+busybox-net-misc.931c6c0424442edc909513373538d848a1370283b47a1df9e978276a570bd9bf
+#+busybox-net-tools.a33d2c612b8f40522d13835eae807a6683dff6d82151e04aa8a612156d5d4ccd
+#+busybox-traceroute.bc9aa2ba46b44d59785440d3ed81f2fc607dbe3fe64c280d1542f6b6830b55bd
+#+busybox-wget.47bc24dfd8887fb5f2f263adc35ddeea0e86452c95978d735ee242b760b863f1
+#+busybox-chpst.03c895e0e1320cbe1f784b43ddd8bb157a50ad9d0789661d4df8ab1e65c6af65
+#+busybox-console.4088ade3a3ec63ca41d68b45da13a2436dd9a4514a3aff8bb33533251999cb4c
+#+busybox-getty.3591ee3af405a3d60d57663f7cbcc5c9b8bef588bc0c50e33f240f7893139828
+#+busybox-i2c-tools.5f98c086ca9b85b58403233f9c25471b25abef1435412fb9632122d3a4b3fc28
+#+busybox-linux-extra.446fc73242ba2d0403c92727123091a27e1fe6827bf7bd3f64b3ca7a18d38073
+#+busybox-mtd-utils.94764e0475afd2b86ab6059367fe63ffee7d06ad542ffb24625a021fc1c6347c
+#+busybox-shadow.c48166d15ab615b62a7b1ec7ccccc14ea8d16ac7008991be030025dcdceb4004
+#+busybox-su.c904ae34bc11e8d4dc6d8e2b1bba284699b633dac60f4204915fdcb52a8a7c5e
+#+busybox-util-linux-priv.85a48e38d9652f0aa9bab84318bf2f2098b978100da481556ac7cadcedacc2d3
+#+busybox-logging.ad629aedc4a1e52f6626b977f41241dcf816999e0ab70f4c55f6bb110a426b24
+#+busybox-cron.fbe883c04f089bbd0feeef2b880f4594c7c9662cc8d854b6db725bf4b6725bcd
+#+execline.d1173f1d6b9c503c39bdf1f64572e46d4409211d577432338ddcbf377c05145d
+#+s6.bc72d08c75a6e415c23c92aed330651f49f979b2cb1a35a70d8ad6d193b219b0
+#+mdev-scripts.c9cc0195ea268f562aa3b390c6fda1d479f73519a4e779574f71c4236ad1d7ce
+#+mdevd.aa9364e677d9f8ccc78d774a82c50c14bcd7942c831785ed0d4c9b09ff1113a8
+#+busybox.97232e51769ad578af205cffdd8e30c208306d2ca9e61cfb02222399f03470c4+
\ 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
 #@git:fefc95731f1260810a3551226b73d35f3d6e9d9e:mlog
 
 
diff --git a/variants/ccx-x86_64/musl-cross-make:old b/variants/ccx-x86_64/musl-cross-make:old
@@ -1,8 +1,8 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nofail_digest
-#+musl-cross-make.cb1dda53f3f2c6dcc6c4ae3e33670c01847c9f4e5dd1219df9dbab56b5f01cce
-#+gnu-make.42012c9161943f38bef21b9ce00a30576de83eb642f72f2e93269f9d034ee14b
-#+busybox.980c2821c3cd4d68975fa24e491fff3b352be7db6725344849a7443b84b3e819
+#+musl-cross-make.2f63fe1ffce685929408aad19eb570f3700781f70f740ddca34e79c01ca48c65
+#+gnu-make.70b59502f0ecc5608ccb5cde06e01572d522d8b4a4325daea556d6a12ad2ae20
+#+busybox.0cb717b44cf7cb9067ff6fa757e1487862365640034e97bf719e1f8f689b882b
 #@sha256:0cdd76777a0dfd3dd3a63f215f030208ddb91c2361d2bcc02acec0f1c16b6a2e:musl-cross-make/sources/binutils-2.44.tar.gz
 #@sha256:a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898:musl-cross-make/sources/gmp-6.3.0.tar.xz
 #@sha256:b67ba0383ef7e8a8563734e2e889ef5ec3c3b898a01d00fa0a6869ad81c6ce01:musl-cross-make/sources/mpfr-4.2.2.tar.xz
@@ -62,9 +62,9 @@ for linkname in "$dd"'/x86_64-linux-musl/lib/'ld-musl-*so*; do
 done
 
 # Validate the compiler
-"$dd"'/bin/x86_64-linux-musl-gcc' --version
-"$dd"'/bin/x86_64-linux-musl-gcc' -o true true.c
-"$dd"'/bin/x86_64-linux-musl-readelf' --string-dump=.interp true >true.linker
+"$dd"'/command/x86_64-linux-musl-gcc' --version
+"$dd"'/command/x86_64-linux-musl-gcc' -o true true.c
+"$dd"'/command/x86_64-linux-musl-readelf' --string-dump=.interp true >true.linker
 grep -F "$pthbs_package" true.linker
 
 pkgs="gmp mpc mpfr zlib"
@@ -91,7 +91,7 @@ printf '%s\n' > "$dd/library/pkgconfig/zlib.pc" \
 
 
 # validate zlib
-"$dd"'/bin/x86_64-linux-musl-gcc' -I"$dd/include" -L"$dd/lib" -static -o zpipe zpipe.c -lz
+"$dd"'/command/x86_64-linux-musl-gcc' -I"$dd/include" -L"$dd/lib" -static -o zpipe zpipe.c -lz
 ./zpipe <true.c >true.c.gz
 ./zpipe -d <true.c.gz >true.c.2
 cmp -s true.c true.c.2
diff --git a/variants/ccx-x86_64/musl-cross-make:oldbootstrap-1 b/variants/ccx-x86_64/musl-cross-make:oldbootstrap-1
@@ -63,9 +63,9 @@ for linkname in "${pthbs_destdir%/}"'/home/ccx/versions/'"$pthbs_package"'/x86_6
 done
 
 # Validate the compiler
-"${pthbs_destdir%/}"'/home/ccx/versions'"/$pthbs_package/bin/"'x86_64-linux-musl-gcc' --version
-"${pthbs_destdir%/}"'/home/ccx/versions'"/$pthbs_package/bin/"'x86_64-linux-musl-gcc' -o true true.c
-"${pthbs_destdir%/}"'/home/ccx/versions'"/$pthbs_package/bin/"'x86_64-linux-musl-readelf' --string-dump=.interp true >true.linker
+"$dest/command/"'x86_64-linux-musl-gcc' --version
+"$dest/command/"'x86_64-linux-musl-gcc' -o true true.c
+"$dest/command/"'x86_64-linux-musl-readelf' --string-dump=.interp true >true.linker
 grep -F "$pthbs_package" true.linker
 
 
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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+bison.53ad5d8cd8308bc9731fbbfdf6a9de7d074c82cd022a7e1f80b42c525257dfe7
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+bison.74d96290385c947d867923bf3fbe15e75990583876f7f280db218771852c63ee
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+m4.f9b2fbfe5dcb1c1bff8d7996333a9477f89931cd93b3b72a7d9d8fac4637746c
-#+netbsd-curses.8ae0f616ad1d23567f9e89826e70983f8c611799e179901c4f1601ed5f74f8b5
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+m4.ce5c949ddb16f3270907b044c9aa1d9441a41305256efa8f95332955db555e51
+#+netbsd-curses.ab9d249042cd6f044a368cd1697e8e22b94d06657e0be86b739ef2d0e846714b
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.1264825203acf9e03d40d7e3cf1cc29f5d9a9744d97343bc4c5ab19ec49ade19
-#+ocaml-findlib.22bfca2dba5c353f6619092108b84f633520d4498a0b584bb805f3a62c2e623a
-#+ocamlbuild.b0bcd39236585c793c32e32d8895b2fd460d8f3d74bcbc69e10f606257b45fe6
-#+opam.6bb77436c7fddff51884456eb52c2f8d6421663dcca8f2df06d6a331bfb58b01
-#+ocaml-topkg.84d64d3bcaae4839c698b2575b141ffedb9281f7025404dec0e77e215cfe003a
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+ocaml.9c3907adfbbbf4cfe511cb6b968a86b43bf85a7fbed175da44c6feecd7639faf
+#+ocaml-findlib.b4d76588fe30a7afd522baff956cc5505c52b0863dec625ae9f6088a11f7fd0f
+#+ocamlbuild.13db3816ad613383ddd97a1e4601e7c0766f2d76394368cbc8932187ca8bcd10
+#+opam.6d451f20c44ef760f04e5c930a54a99d403c61b9646e9803f602fd748570f19f
+#+ocaml-topkg.a17c6621cec17c143625e727ce088c7ea54265b6699f742e5197f30a8cddc14b
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.1264825203acf9e03d40d7e3cf1cc29f5d9a9744d97343bc4c5ab19ec49ade19
-#+dune.0831133ca98e4e59f21caadbf8bb9dede42c17b26f6649800686d063a851f34e
-#+ocaml_intrinsics_kernel.d9aab3033ccbceb462d999b183faf6bec4d302c3839903b04adf502877c160b4
-#+ocaml-sexplib0.fb4b15114d8e83ff01b7175999773ce1892bffa85f9d30f8227dbcad111d406b
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+ocaml.9c3907adfbbbf4cfe511cb6b968a86b43bf85a7fbed175da44c6feecd7639faf
+#+dune.733ad79e918d9ff9d9a71d8c5f9330af4317105211999254c74a410203fd6dcd
+#+ocaml_intrinsics_kernel.dff363a787cf528a9676751f706da4bdee9c48f9f32979a7db2327bbe6e2e56d
+#+ocaml-sexplib0.7b768cfbfc90efaadf6144c709b94b7846c29306ea49fea3374fb2ef747f6a42
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.1264825203acf9e03d40d7e3cf1cc29f5d9a9744d97343bc4c5ab19ec49ade19
-#+ocaml-findlib.22bfca2dba5c353f6619092108b84f633520d4498a0b584bb805f3a62c2e623a
-#+ocamlbuild.b0bcd39236585c793c32e32d8895b2fd460d8f3d74bcbc69e10f606257b45fe6
-#+opam.6bb77436c7fddff51884456eb52c2f8d6421663dcca8f2df06d6a331bfb58b01
-#+ocaml-topkg.84d64d3bcaae4839c698b2575b141ffedb9281f7025404dec0e77e215cfe003a
-#+ocaml-astring.d75f2947c71a8f0d5b2dcdcc6a8dd1452ec3a1b25b9d00bb3515953fd110c70e
-#+ocaml-fpath.bb615904e620d023f473d135ae8122ae7f6dd0e0a356e70eb719114db1a2a5bf
-#+ocaml-rresult.d7cd57b8d49afbc72cb02424893fd6cfdd5064a85ca23fc0f8da2484df29c85a
-#+ocaml-fmt.58f6a943e5ab6eb7922347ece7c6ce47caf9a51594783bb48e9f6d682067826d
-#+ocaml-logs.72b5198b2ff0abcdfbc7d34825904f84c781e73a2e0ce24c9253eb0fa6d12509
-#+ocaml-mtime.65a415c12e595ff5bb9079759f5691dafd05ca418e7603af0b8fc7063ffab0db
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+ocaml.9c3907adfbbbf4cfe511cb6b968a86b43bf85a7fbed175da44c6feecd7639faf
+#+ocaml-findlib.b4d76588fe30a7afd522baff956cc5505c52b0863dec625ae9f6088a11f7fd0f
+#+ocamlbuild.13db3816ad613383ddd97a1e4601e7c0766f2d76394368cbc8932187ca8bcd10
+#+opam.6d451f20c44ef760f04e5c930a54a99d403c61b9646e9803f602fd748570f19f
+#+ocaml-topkg.a17c6621cec17c143625e727ce088c7ea54265b6699f742e5197f30a8cddc14b
+#+ocaml-astring.57da538573d221421f33138f948122c2f8956df81f3e4aa3818679043c699079
+#+ocaml-fpath.bb9eec8642c076457c45b2a8cfbb2105762e4aa733717f47569ec37815de6ee1
+#+ocaml-rresult.b137557a47db05d1fd4d00f41e025cc8d81993807f12152daa51ec1cbbcd470e
+#+ocaml-fmt.cf7e8c5c64fa87cc99b6a8354a3df17bb68acfdc4bd0383bd71b11d08368de94
+#+ocaml-logs.1c6d84a2658ef072696bc6a9186b183663fc550fb797029e8e2543a834f51e27
+#+ocaml-mtime.44cd234ce8a18f7d146f3e3e62e73fb19e6d0a4ccc1dcb8a1a9324d9007b18f7
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.1264825203acf9e03d40d7e3cf1cc29f5d9a9744d97343bc4c5ab19ec49ade19
-#+ocaml-findlib.22bfca2dba5c353f6619092108b84f633520d4498a0b584bb805f3a62c2e623a
-#+ocamlbuild.b0bcd39236585c793c32e32d8895b2fd460d8f3d74bcbc69e10f606257b45fe6
-#+opam.6bb77436c7fddff51884456eb52c2f8d6421663dcca8f2df06d6a331bfb58b01
-#+ocaml-topkg.84d64d3bcaae4839c698b2575b141ffedb9281f7025404dec0e77e215cfe003a
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+ocaml.9c3907adfbbbf4cfe511cb6b968a86b43bf85a7fbed175da44c6feecd7639faf
+#+ocaml-findlib.b4d76588fe30a7afd522baff956cc5505c52b0863dec625ae9f6088a11f7fd0f
+#+ocamlbuild.13db3816ad613383ddd97a1e4601e7c0766f2d76394368cbc8932187ca8bcd10
+#+opam.6d451f20c44ef760f04e5c930a54a99d403c61b9646e9803f602fd748570f19f
+#+ocaml-topkg.a17c6621cec17c143625e727ce088c7ea54265b6699f742e5197f30a8cddc14b
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.1264825203acf9e03d40d7e3cf1cc29f5d9a9744d97343bc4c5ab19ec49ade19
-#+dune.0831133ca98e4e59f21caadbf8bb9dede42c17b26f6649800686d063a851f34e
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+ocaml.9c3907adfbbbf4cfe511cb6b968a86b43bf85a7fbed175da44c6feecd7639faf
+#+dune.733ad79e918d9ff9d9a71d8c5f9330af4317105211999254c74a410203fd6dcd
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.1264825203acf9e03d40d7e3cf1cc29f5d9a9744d97343bc4c5ab19ec49ade19
-#+dune.0831133ca98e4e59f21caadbf8bb9dede42c17b26f6649800686d063a851f34e
-#+ocamlbuild.b0bcd39236585c793c32e32d8895b2fd460d8f3d74bcbc69e10f606257b45fe6
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+ocaml.9c3907adfbbbf4cfe511cb6b968a86b43bf85a7fbed175da44c6feecd7639faf
+#+dune.733ad79e918d9ff9d9a71d8c5f9330af4317105211999254c74a410203fd6dcd
+#+ocamlbuild.13db3816ad613383ddd97a1e4601e7c0766f2d76394368cbc8932187ca8bcd10
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+m4.f9b2fbfe5dcb1c1bff8d7996333a9477f89931cd93b3b72a7d9d8fac4637746c
-#+netbsd-curses.8ae0f616ad1d23567f9e89826e70983f8c611799e179901c4f1601ed5f74f8b5
-#+ocaml.1264825203acf9e03d40d7e3cf1cc29f5d9a9744d97343bc4c5ab19ec49ade19
-#+ocamlbuild.b0bcd39236585c793c32e32d8895b2fd460d8f3d74bcbc69e10f606257b45fe6
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+m4.ce5c949ddb16f3270907b044c9aa1d9441a41305256efa8f95332955db555e51
+#+netbsd-curses.ab9d249042cd6f044a368cd1697e8e22b94d06657e0be86b739ef2d0e846714b
+#+ocaml.9c3907adfbbbf4cfe511cb6b968a86b43bf85a7fbed175da44c6feecd7639faf
+#+ocamlbuild.13db3816ad613383ddd97a1e4601e7c0766f2d76394368cbc8932187ca8bcd10
 #@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.1264825203acf9e03d40d7e3cf1cc29f5d9a9744d97343bc4c5ab19ec49ade19"
+stdlib="$pthbs_destdir/home/ccx/versions/ocaml.9c3907adfbbbf4cfe511cb6b968a86b43bf85a7fbed175da44c6feecd7639faf"
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.1264825203acf9e03d40d7e3cf1cc29f5d9a9744d97343bc4c5ab19ec49ade19
-#+ocaml-findlib.22bfca2dba5c353f6619092108b84f633520d4498a0b584bb805f3a62c2e623a
-#+ocamlbuild.b0bcd39236585c793c32e32d8895b2fd460d8f3d74bcbc69e10f606257b45fe6
-#+opam.6bb77436c7fddff51884456eb52c2f8d6421663dcca8f2df06d6a331bfb58b01
-#+ocaml-topkg.84d64d3bcaae4839c698b2575b141ffedb9281f7025404dec0e77e215cfe003a
-#+ocaml-cmdliner.b073cb3e2f65560e1c56ad88b5346544ecd82e7fb363cb9fbe64bdf917ed5875
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+ocaml.9c3907adfbbbf4cfe511cb6b968a86b43bf85a7fbed175da44c6feecd7639faf
+#+ocaml-findlib.b4d76588fe30a7afd522baff956cc5505c52b0863dec625ae9f6088a11f7fd0f
+#+ocamlbuild.13db3816ad613383ddd97a1e4601e7c0766f2d76394368cbc8932187ca8bcd10
+#+opam.6d451f20c44ef760f04e5c930a54a99d403c61b9646e9803f602fd748570f19f
+#+ocaml-topkg.a17c6621cec17c143625e727ce088c7ea54265b6699f742e5197f30a8cddc14b
+#+ocaml-cmdliner.c71e7c6d2ae18ace042a77a086cfba52d33a8b2d5a52713d30e0f758fe909e3e
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.1264825203acf9e03d40d7e3cf1cc29f5d9a9744d97343bc4c5ab19ec49ade19
-#+ocaml-findlib.22bfca2dba5c353f6619092108b84f633520d4498a0b584bb805f3a62c2e623a
-#+ocamlbuild.b0bcd39236585c793c32e32d8895b2fd460d8f3d74bcbc69e10f606257b45fe6
-#+opam.6bb77436c7fddff51884456eb52c2f8d6421663dcca8f2df06d6a331bfb58b01
-#+ocaml-topkg.84d64d3bcaae4839c698b2575b141ffedb9281f7025404dec0e77e215cfe003a
-#+ocaml-astring.d75f2947c71a8f0d5b2dcdcc6a8dd1452ec3a1b25b9d00bb3515953fd110c70e
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+ocaml.9c3907adfbbbf4cfe511cb6b968a86b43bf85a7fbed175da44c6feecd7639faf
+#+ocaml-findlib.b4d76588fe30a7afd522baff956cc5505c52b0863dec625ae9f6088a11f7fd0f
+#+ocamlbuild.13db3816ad613383ddd97a1e4601e7c0766f2d76394368cbc8932187ca8bcd10
+#+opam.6d451f20c44ef760f04e5c930a54a99d403c61b9646e9803f602fd748570f19f
+#+ocaml-topkg.a17c6621cec17c143625e727ce088c7ea54265b6699f742e5197f30a8cddc14b
+#+ocaml-astring.57da538573d221421f33138f948122c2f8956df81f3e4aa3818679043c699079
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.1264825203acf9e03d40d7e3cf1cc29f5d9a9744d97343bc4c5ab19ec49ade19
-#+ocaml-findlib.22bfca2dba5c353f6619092108b84f633520d4498a0b584bb805f3a62c2e623a
-#+ocamlbuild.b0bcd39236585c793c32e32d8895b2fd460d8f3d74bcbc69e10f606257b45fe6
-#+opam.6bb77436c7fddff51884456eb52c2f8d6421663dcca8f2df06d6a331bfb58b01
-#+ocaml-topkg.84d64d3bcaae4839c698b2575b141ffedb9281f7025404dec0e77e215cfe003a
-#+ocaml-mtime.65a415c12e595ff5bb9079759f5691dafd05ca418e7603af0b8fc7063ffab0db
-#+ocaml-cmdliner.b073cb3e2f65560e1c56ad88b5346544ecd82e7fb363cb9fbe64bdf917ed5875
-#+ocaml-fmt.58f6a943e5ab6eb7922347ece7c6ce47caf9a51594783bb48e9f6d682067826d
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+ocaml.9c3907adfbbbf4cfe511cb6b968a86b43bf85a7fbed175da44c6feecd7639faf
+#+ocaml-findlib.b4d76588fe30a7afd522baff956cc5505c52b0863dec625ae9f6088a11f7fd0f
+#+ocamlbuild.13db3816ad613383ddd97a1e4601e7c0766f2d76394368cbc8932187ca8bcd10
+#+opam.6d451f20c44ef760f04e5c930a54a99d403c61b9646e9803f602fd748570f19f
+#+ocaml-topkg.a17c6621cec17c143625e727ce088c7ea54265b6699f742e5197f30a8cddc14b
+#+ocaml-mtime.44cd234ce8a18f7d146f3e3e62e73fb19e6d0a4ccc1dcb8a1a9324d9007b18f7
+#+ocaml-cmdliner.c71e7c6d2ae18ace042a77a086cfba52d33a8b2d5a52713d30e0f758fe909e3e
+#+ocaml-fmt.cf7e8c5c64fa87cc99b6a8354a3df17bb68acfdc4bd0383bd71b11d08368de94
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.1264825203acf9e03d40d7e3cf1cc29f5d9a9744d97343bc4c5ab19ec49ade19
-#+dune.0831133ca98e4e59f21caadbf8bb9dede42c17b26f6649800686d063a851f34e
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+ocaml.9c3907adfbbbf4cfe511cb6b968a86b43bf85a7fbed175da44c6feecd7639faf
+#+dune.733ad79e918d9ff9d9a71d8c5f9330af4317105211999254c74a410203fd6dcd
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.1264825203acf9e03d40d7e3cf1cc29f5d9a9744d97343bc4c5ab19ec49ade19
-#+ocaml-findlib.22bfca2dba5c353f6619092108b84f633520d4498a0b584bb805f3a62c2e623a
-#+ocamlbuild.b0bcd39236585c793c32e32d8895b2fd460d8f3d74bcbc69e10f606257b45fe6
-#+opam.6bb77436c7fddff51884456eb52c2f8d6421663dcca8f2df06d6a331bfb58b01
-#+ocaml-topkg.84d64d3bcaae4839c698b2575b141ffedb9281f7025404dec0e77e215cfe003a
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+ocaml.9c3907adfbbbf4cfe511cb6b968a86b43bf85a7fbed175da44c6feecd7639faf
+#+ocaml-findlib.b4d76588fe30a7afd522baff956cc5505c52b0863dec625ae9f6088a11f7fd0f
+#+ocamlbuild.13db3816ad613383ddd97a1e4601e7c0766f2d76394368cbc8932187ca8bcd10
+#+opam.6d451f20c44ef760f04e5c930a54a99d403c61b9646e9803f602fd748570f19f
+#+ocaml-topkg.a17c6621cec17c143625e727ce088c7ea54265b6699f742e5197f30a8cddc14b
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.1264825203acf9e03d40d7e3cf1cc29f5d9a9744d97343bc4c5ab19ec49ade19
-#+dune.0831133ca98e4e59f21caadbf8bb9dede42c17b26f6649800686d063a851f34e
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+ocaml.9c3907adfbbbf4cfe511cb6b968a86b43bf85a7fbed175da44c6feecd7639faf
+#+dune.733ad79e918d9ff9d9a71d8c5f9330af4317105211999254c74a410203fd6dcd
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.1264825203acf9e03d40d7e3cf1cc29f5d9a9744d97343bc4c5ab19ec49ade19
-#+dune.0831133ca98e4e59f21caadbf8bb9dede42c17b26f6649800686d063a851f34e
-#+ocaml-compiler-libs.4373c602072f75937e4d6d00a1d54cf7cc5b1594afbc6f574d9c14047a965aee
-#+ocaml-cppo.16320e4067f7206e88207849f49dc1f429508a57851365f159bfa58ccf8739a5
-#+ocaml-findlib.22bfca2dba5c353f6619092108b84f633520d4498a0b584bb805f3a62c2e623a
-#+ocaml-ppx_derivers.c5a1a0f73e6263c40e04202eb59d1e9cb7bddc463e9dca60bb2dccd4e47af549
-#+ocaml-ppxlib.a4ee512f3f754f592f7ac114e5cb98c654a96a9cb6a49d8a1a5b7b8eeb6fb0fd
-#+ocaml-sexplib0.fb4b15114d8e83ff01b7175999773ce1892bffa85f9d30f8227dbcad111d406b
-#+ocaml-stdlib-shims.eed12c6b46a70392152205f4d7f55297c9ab1e44ba2440f281880dc780de7f92
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+ocaml.9c3907adfbbbf4cfe511cb6b968a86b43bf85a7fbed175da44c6feecd7639faf
+#+dune.733ad79e918d9ff9d9a71d8c5f9330af4317105211999254c74a410203fd6dcd
+#+ocaml-compiler-libs.10f797a5915d362fd22b6b768be533c269b469da194227f66cceae9b07277048
+#+ocaml-cppo.94acfd561c0d5df7c86b71b7cca85e6efc224a196655f34f6a761a4d7ee20123
+#+ocaml-findlib.b4d76588fe30a7afd522baff956cc5505c52b0863dec625ae9f6088a11f7fd0f
+#+ocaml-ppx_derivers.20544c400c619d1a65776d85854341dc50dc4d9580f53b76d72dc60d137eeaca
+#+ocaml-ppxlib.0ea88aeeebf2092ce8632fa364f2ea49bb9b5a0d9b8e445c0dce2259d2303310
+#+ocaml-sexplib0.7b768cfbfc90efaadf6144c709b94b7846c29306ea49fea3374fb2ef747f6a42
+#+ocaml-stdlib-shims.a99cd54b95d9a034bda80aada132804583c300ac2138d794d9c00a4e4b19ffec
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.1264825203acf9e03d40d7e3cf1cc29f5d9a9744d97343bc4c5ab19ec49ade19
-#+dune.0831133ca98e4e59f21caadbf8bb9dede42c17b26f6649800686d063a851f34e
-#+ocaml-compiler-libs.4373c602072f75937e4d6d00a1d54cf7cc5b1594afbc6f574d9c14047a965aee
-#+ocaml-ppx_derivers.c5a1a0f73e6263c40e04202eb59d1e9cb7bddc463e9dca60bb2dccd4e47af549
-#+ocaml-sexplib0.fb4b15114d8e83ff01b7175999773ce1892bffa85f9d30f8227dbcad111d406b
-#+ocaml-stdlib-shims.eed12c6b46a70392152205f4d7f55297c9ab1e44ba2440f281880dc780de7f92
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+ocaml.9c3907adfbbbf4cfe511cb6b968a86b43bf85a7fbed175da44c6feecd7639faf
+#+dune.733ad79e918d9ff9d9a71d8c5f9330af4317105211999254c74a410203fd6dcd
+#+ocaml-compiler-libs.10f797a5915d362fd22b6b768be533c269b469da194227f66cceae9b07277048
+#+ocaml-ppx_derivers.20544c400c619d1a65776d85854341dc50dc4d9580f53b76d72dc60d137eeaca
+#+ocaml-sexplib0.7b768cfbfc90efaadf6144c709b94b7846c29306ea49fea3374fb2ef747f6a42
+#+ocaml-stdlib-shims.a99cd54b95d9a034bda80aada132804583c300ac2138d794d9c00a4e4b19ffec
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.1264825203acf9e03d40d7e3cf1cc29f5d9a9744d97343bc4c5ab19ec49ade19
-#+ocaml-findlib.22bfca2dba5c353f6619092108b84f633520d4498a0b584bb805f3a62c2e623a
-#+ocamlbuild.b0bcd39236585c793c32e32d8895b2fd460d8f3d74bcbc69e10f606257b45fe6
-#+opam.6bb77436c7fddff51884456eb52c2f8d6421663dcca8f2df06d6a331bfb58b01
-#+ocaml-topkg.84d64d3bcaae4839c698b2575b141ffedb9281f7025404dec0e77e215cfe003a
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+ocaml.9c3907adfbbbf4cfe511cb6b968a86b43bf85a7fbed175da44c6feecd7639faf
+#+ocaml-findlib.b4d76588fe30a7afd522baff956cc5505c52b0863dec625ae9f6088a11f7fd0f
+#+ocamlbuild.13db3816ad613383ddd97a1e4601e7c0766f2d76394368cbc8932187ca8bcd10
+#+opam.6d451f20c44ef760f04e5c930a54a99d403c61b9646e9803f602fd748570f19f
+#+ocaml-topkg.a17c6621cec17c143625e727ce088c7ea54265b6699f742e5197f30a8cddc14b
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.1264825203acf9e03d40d7e3cf1cc29f5d9a9744d97343bc4c5ab19ec49ade19
-#+dune.0831133ca98e4e59f21caadbf8bb9dede42c17b26f6649800686d063a851f34e
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+ocaml.9c3907adfbbbf4cfe511cb6b968a86b43bf85a7fbed175da44c6feecd7639faf
+#+dune.733ad79e918d9ff9d9a71d8c5f9330af4317105211999254c74a410203fd6dcd
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.1264825203acf9e03d40d7e3cf1cc29f5d9a9744d97343bc4c5ab19ec49ade19
-#+dune.0831133ca98e4e59f21caadbf8bb9dede42c17b26f6649800686d063a851f34e
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+ocaml.9c3907adfbbbf4cfe511cb6b968a86b43bf85a7fbed175da44c6feecd7639faf
+#+dune.733ad79e918d9ff9d9a71d8c5f9330af4317105211999254c74a410203fd6dcd
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.1264825203acf9e03d40d7e3cf1cc29f5d9a9744d97343bc4c5ab19ec49ade19
-#+ocaml-findlib.22bfca2dba5c353f6619092108b84f633520d4498a0b584bb805f3a62c2e623a
-#+ocamlbuild.b0bcd39236585c793c32e32d8895b2fd460d8f3d74bcbc69e10f606257b45fe6
-#+opam.6bb77436c7fddff51884456eb52c2f8d6421663dcca8f2df06d6a331bfb58b01
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+ocaml.9c3907adfbbbf4cfe511cb6b968a86b43bf85a7fbed175da44c6feecd7639faf
+#+ocaml-findlib.b4d76588fe30a7afd522baff956cc5505c52b0863dec625ae9f6088a11f7fd0f
+#+ocamlbuild.13db3816ad613383ddd97a1e4601e7c0766f2d76394368cbc8932187ca8bcd10
+#+opam.6d451f20c44ef760f04e5c930a54a99d403c61b9646e9803f602fd748570f19f
 #@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.1264825203acf9e03d40d7e3cf1cc29f5d9a9744d97343bc4c5ab19ec49ade19
-#+dune.0831133ca98e4e59f21caadbf8bb9dede42c17b26f6649800686d063a851f34e
-#+ocamlbuild.b0bcd39236585c793c32e32d8895b2fd460d8f3d74bcbc69e10f606257b45fe6
-#+ocaml-base.d1312d6eccc2ca54c6a043fcc5181965653982439c0bc6935fae7ebd8bfd3211
-#+opam.6bb77436c7fddff51884456eb52c2f8d6421663dcca8f2df06d6a331bfb58b01
-#+ocaml-bos.1920fd23cd946ddc1ef702de7b3474cab9e7c2305f1a52dd9d1767ef2574afc1
-#+ocaml-lun.d0881d2949c316e772ae397d05ced837907bf7d4dd2fa81894584153e11b4f25
-#+ocaml-ppx_deriving.585ddb58eb304b4e6fc5595335dfdd3d99015e05ab9664bb05b41ef2e08b2936-
\ No newline at end of file
+#+ocaml.9c3907adfbbbf4cfe511cb6b968a86b43bf85a7fbed175da44c6feecd7639faf
+#+dune.733ad79e918d9ff9d9a71d8c5f9330af4317105211999254c74a410203fd6dcd
+#+ocamlbuild.13db3816ad613383ddd97a1e4601e7c0766f2d76394368cbc8932187ca8bcd10
+#+ocaml-base.0b70d351729f18a787bf334d32699935c47588f7fa62c46c6ef9e04041addf80
+#+opam.6d451f20c44ef760f04e5c930a54a99d403c61b9646e9803f602fd748570f19f
+#+ocaml-bos.3faadfec59261a92e9c383f3ce8aac5b540f7fac335659a463d1dbc9842b49dd
+#+ocaml-lun.177c18b34c53cf84ada74ca6f2b3b9f0b255838a586d2b4e5c515729c8396c5a
+#+ocaml-ppx_deriving.e6ecac600e886a863f6c506fa09548fbfdd87b9ffac34ce85c07b37a0792e126+
\ 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+m4.f9b2fbfe5dcb1c1bff8d7996333a9477f89931cd93b3b72a7d9d8fac4637746c
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+m4.ce5c949ddb16f3270907b044c9aa1d9441a41305256efa8f95332955db555e51
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+ocaml.1264825203acf9e03d40d7e3cf1cc29f5d9a9744d97343bc4c5ab19ec49ade19
-#+dune.0831133ca98e4e59f21caadbf8bb9dede42c17b26f6649800686d063a851f34e
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+ocaml.9c3907adfbbbf4cfe511cb6b968a86b43bf85a7fbed175da44c6feecd7639faf
+#+dune.733ad79e918d9ff9d9a71d8c5f9330af4317105211999254c74a410203fd6dcd
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+m4.f9b2fbfe5dcb1c1bff8d7996333a9477f89931cd93b3b72a7d9d8fac4637746c
-#+ocaml.1264825203acf9e03d40d7e3cf1cc29f5d9a9744d97343bc4c5ab19ec49ade19
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+m4.ce5c949ddb16f3270907b044c9aa1d9441a41305256efa8f95332955db555e51
+#+ocaml.9c3907adfbbbf4cfe511cb6b968a86b43bf85a7fbed175da44c6feecd7639faf
 #@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.1264825203acf9e03d40d7e3cf1cc29f5d9a9744d97343bc4c5ab19ec49ade19"
+stdlib="$pthbs_destdir/home/ccx/versions/ocaml.9c3907adfbbbf4cfe511cb6b968a86b43bf85a7fbed175da44c6feecd7639faf"
 mkdir -p "${stdlib%/*}"
 ln -s "$pthbs_package" "$stdlib"
 
diff --git a/variants/ccx-x86_64/oldbootstrap.environment b/variants/ccx-x86_64/oldbootstrap.environment
@@ -1,4 +1,4 @@
 #!/usr/bin/env pthbs-build
-#+busybox.980c2821c3cd4d68975fa24e491fff3b352be7db6725344849a7443b84b3e819
-#+gnu-make.42012c9161943f38bef21b9ce00a30576de83eb642f72f2e93269f9d034ee14b
-#+musl-cross-make.cb1dda53f3f2c6dcc6c4ae3e33670c01847c9f4e5dd1219df9dbab56b5f01cce-
\ No newline at end of file
+#+busybox.0cb717b44cf7cb9067ff6fa757e1487862365640034e97bf719e1f8f689b882b
+#+gnu-make.70b59502f0ecc5608ccb5cde06e01572d522d8b4a4325daea556d6a12ad2ae20
+#+musl-cross-make.2f63fe1ffce685929408aad19eb570f3700781f70f740ddca34e79c01ca48c65+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/oldsystem.environment b/variants/ccx-x86_64/oldsystem.environment
@@ -1,4 +1,4 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.b30fd5b7c961fff18271b301c05c03e168a8c832133a996fa270fec71a5cf768
-#+busybox.8c8f7b0616c42faac1b74742b717a4a5a88f2a5701a224c053b3ef4eeb8b834c
-#+gnu-make.f3f0681903659496b818f59f15b5b219ffe0f370b1ce1b42ed664f80b3fd6183-
\ No newline at end of file
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+busybox.824d694ff5cd0662d4af61e7acabc32cf1eca692a017de309f5f802554182203
+#+gnu-make.bf0821bf6e845f939bf6a11023ec3bdc4df65122ee8c278aedbcaea9cae6cca6+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/opam b/variants/ccx-x86_64/opam
@@ -1,41 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+diffutils.53a5ebd33a6c5213495e2d633b8807c250c4b0436fc9bb981c38b2c23196f29b
-#+patch.1e18582a339e228c44c333e8fe5e673fec1cc277cfdc756cb8b7582855184a14
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+getconf.8a0ba3ae885e5d50ecfa2325883f22f98feb0604101d5fb1fee86eaf0280535f
-#+ocaml.1264825203acf9e03d40d7e3cf1cc29f5d9a9744d97343bc4c5ab19ec49ade19
-#+dune.0831133ca98e4e59f21caadbf8bb9dede42c17b26f6649800686d063a851f34e
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+diffutils.3eee2e19774b5195e35e0d8d725832bd1a6e0676505154642edc6c656983d48b
+#+patch.ea64352f820d24d1dadb99419df4729331bf853f8f8456ababa17bba53761a70
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+getconf.c026a1310708f63a014f655316c6de232ab07ceaaaf44e29961f933eaa93b359
+#+ocaml.9c3907adfbbbf4cfe511cb6b968a86b43bf85a7fbed175da44c6feecd7639faf
+#+dune.733ad79e918d9ff9d9a71d8c5f9330af4317105211999254c74a410203fd6dcd
 #@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.0831133ca98e4e59f21caadbf8bb9dede42c17b26f6649800686d063a851f34e/command/dune' \
+	--with-dune='/home/ccx/versions/dune.733ad79e918d9ff9d9a71d8c5f9330af4317105211999254c74a410203fd6dcd/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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+m4.f9b2fbfe5dcb1c1bff8d7996333a9477f89931cd93b3b72a7d9d8fac4637746c
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+m4.ce5c949ddb16f3270907b044c9aa1d9441a41305256efa8f95332955db555e51
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+m4.f9b2fbfe5dcb1c1bff8d7996333a9477f89931cd93b3b72a7d9d8fac4637746c
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+m4.ce5c949ddb16f3270907b044c9aa1d9441a41305256efa8f95332955db555e51
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+pkgconf.45675433f53243c11efcfa12aba14f29f77daf0ea79634d35f897a2ae0101271
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+pkgconf.95fc24153914c0b48e8b8aedeeb46b0c69acb3bca899affb1ca762fd2e366b6c
 
 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+m4.f9b2fbfe5dcb1c1bff8d7996333a9477f89931cd93b3b72a7d9d8fac4637746c
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+m4.ce5c949ddb16f3270907b044c9aa1d9441a41305256efa8f95332955db555e51
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+zsh.90597dd1d8fe6717e07eb26ad736cdf611ce750252fd3339e5f0c2a58a8cf497
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+zsh.92e0cd3c6ca1613b06de7e3cc3d31a8cb1939757b6af7c8d5d268c139a861bd6
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+m4.f9b2fbfe5dcb1c1bff8d7996333a9477f89931cd93b3b72a7d9d8fac4637746c
-#+nawk.fa3a319e708ba615cea1b327b59011ccf01440eb19c8296ad754949f6dd0fe9f
-#+popt.c16bf8295bbcff1cd76aa5ff31b0955a0dc00508d118fdb0098465b43c58e42a
-#+libressl.9bb98ac5f3b2f7f0d13d3ad47144ab754d4ae4eb5054cdbd0c53cd8430d75f3c
-#+zstd.2fad9c24062df52192bc619283c01c794028f831b9a005c0bdd8f2c18fbbd856
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+m4.ce5c949ddb16f3270907b044c9aa1d9441a41305256efa8f95332955db555e51
+#+nawk.b9c1f0cbd523998e24724d9e951dfad1e638c5361fc93c29076e42e964c4acd8
+#+popt.ee996b263cde6b489ed5cf2daa30e549dfa4998355f07e8b7087e966370470d5
+#+libressl.29616f3b1231a76497df505bc1e977386d4370a00f49cbe58d03ea6b5ac7d1ce
+#+zstd.6e435e3b5a056c983e980d3cf83c4f182db1760e947af71f6dd4702e539d97d9
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+skalibs.1a9f2dcab5ebb24215378af695c819a23c735875b5a9acc0d37372400765ec7b
-#+execline.c74d67fcb3e8c5df31d31928abb5bff6d408f3668c7f90f83835e88c13ab8d75
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+skalibs.b25d0c78a58e3ae7d3a422e1142b30b67aa641c67ffff8db5d941ef31209ceb5
+#+execline.d1173f1d6b9c503c39bdf1f64572e46d4409211d577432338ddcbf377c05145d
 #@git:0e02fe0e92b8f9a619fc355babad2c78c009c1f1:s6
 
 
@@ -49,7 +47,7 @@ cd 's6'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.1a9f2dcab5ebb24215378af695c819a23c735875b5a9acc0d37372400765ec7b/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.b25d0c78a58e3ae7d3a422e1142b30b67aa641c67ffff8db5d941ef31209ceb5/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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+skalibs.1a9f2dcab5ebb24215378af695c819a23c735875b5a9acc0d37372400765ec7b
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+skalibs.b25d0c78a58e3ae7d3a422e1142b30b67aa641c67ffff8db5d941ef31209ceb5
 #@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.1a9f2dcab5ebb24215378af695c819a23c735875b5a9acc0d37372400765ec7b/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.b25d0c78a58e3ae7d3a422e1142b30b67aa641c67ffff8db5d941ef31209ceb5/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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+skalibs.1a9f2dcab5ebb24215378af695c819a23c735875b5a9acc0d37372400765ec7b
-#+execline.c74d67fcb3e8c5df31d31928abb5bff6d408f3668c7f90f83835e88c13ab8d75
-#+s6.126793508d107794bfe8577d1a3fad3ee62e27222a633245465df1340f0f5823
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+skalibs.b25d0c78a58e3ae7d3a422e1142b30b67aa641c67ffff8db5d941ef31209ceb5
+#+execline.d1173f1d6b9c503c39bdf1f64572e46d4409211d577432338ddcbf377c05145d
+#+s6.bc72d08c75a6e415c23c92aed330651f49f979b2cb1a35a70d8ad6d193b219b0
 #@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.1a9f2dcab5ebb24215378af695c819a23c735875b5a9acc0d37372400765ec7b/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.b25d0c78a58e3ae7d3a422e1142b30b67aa641c67ffff8db5d941ef31209ceb5/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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+skalibs.1a9f2dcab5ebb24215378af695c819a23c735875b5a9acc0d37372400765ec7b
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+skalibs.b25d0c78a58e3ae7d3a422e1142b30b67aa641c67ffff8db5d941ef31209ceb5
 #@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.1a9f2dcab5ebb24215378af695c819a23c735875b5a9acc0d37372400765ec7b/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.b25d0c78a58e3ae7d3a422e1142b30b67aa641c67ffff8db5d941ef31209ceb5/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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+skalibs.1a9f2dcab5ebb24215378af695c819a23c735875b5a9acc0d37372400765ec7b
-#+execline.c74d67fcb3e8c5df31d31928abb5bff6d408f3668c7f90f83835e88c13ab8d75
-#+s6.126793508d107794bfe8577d1a3fad3ee62e27222a633245465df1340f0f5823
-#+s6-dns.59cae072cf0a672e10ba0d3af582fa46ef0c5a62801008e74dd914fe6b1a8bae
-#+libressl.9bb98ac5f3b2f7f0d13d3ad47144ab754d4ae4eb5054cdbd0c53cd8430d75f3c
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+skalibs.b25d0c78a58e3ae7d3a422e1142b30b67aa641c67ffff8db5d941ef31209ceb5
+#+execline.d1173f1d6b9c503c39bdf1f64572e46d4409211d577432338ddcbf377c05145d
+#+s6.bc72d08c75a6e415c23c92aed330651f49f979b2cb1a35a70d8ad6d193b219b0
+#+s6-dns.55f6f468259a0d730745d851f28ed9d0acb72e63303bbd1e81e87c2e43890cba
+#+libressl.29616f3b1231a76497df505bc1e977386d4370a00f49cbe58d03ea6b5ac7d1ce
 #@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.1a9f2dcab5ebb24215378af695c819a23c735875b5a9acc0d37372400765ec7b/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.b25d0c78a58e3ae7d3a422e1142b30b67aa641c67ffff8db5d941ef31209ceb5/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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+skalibs.1a9f2dcab5ebb24215378af695c819a23c735875b5a9acc0d37372400765ec7b
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+skalibs.b25d0c78a58e3ae7d3a422e1142b30b67aa641c67ffff8db5d941ef31209ceb5
 #@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.1a9f2dcab5ebb24215378af695c819a23c735875b5a9acc0d37372400765ec7b/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.b25d0c78a58e3ae7d3a422e1142b30b67aa641c67ffff8db5d941ef31209ceb5/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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+skalibs.1a9f2dcab5ebb24215378af695c819a23c735875b5a9acc0d37372400765ec7b
-#+execline.c74d67fcb3e8c5df31d31928abb5bff6d408f3668c7f90f83835e88c13ab8d75
-#+s6.126793508d107794bfe8577d1a3fad3ee62e27222a633245465df1340f0f5823
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+skalibs.b25d0c78a58e3ae7d3a422e1142b30b67aa641c67ffff8db5d941ef31209ceb5
+#+execline.d1173f1d6b9c503c39bdf1f64572e46d4409211d577432338ddcbf377c05145d
+#+s6.bc72d08c75a6e415c23c92aed330651f49f979b2cb1a35a70d8ad6d193b219b0
 #@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.1a9f2dcab5ebb24215378af695c819a23c735875b5a9acc0d37372400765ec7b/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.b25d0c78a58e3ae7d3a422e1142b30b67aa641c67ffff8db5d941ef31209ceb5/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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+zsh.90597dd1d8fe6717e07eb26ad736cdf611ce750252fd3339e5f0c2a58a8cf497
-#+pthbs-banginstall.8dfc859346ef41972e22d44f2e3702eef0a29209e17bdd324e1c0fc46ed98c2e
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+zsh.92e0cd3c6ca1613b06de7e3cc3d31a8cb1939757b6af7c8d5d268c139a861bd6
+#+pthbs-banginstall.72ccb0bd87c499a76481aad1c328a420191befb263be9bf0bb17b827e6aa8ca6
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+attr.d204bb80bf61529b59d348ca3803f8927ff0ea3e87da60dcd15983b5060587f4
-#+zstd.2fad9c24062df52192bc619283c01c794028f831b9a005c0bdd8f2c18fbbd856
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+attr.0dcc626b099c772eca39d1153c15b37543b5546538555195d29742eafc32d56a
+#+zstd.6e435e3b5a056c983e980d3cf83c4f182db1760e947af71f6dd4702e539d97d9
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+m4.f9b2fbfe5dcb1c1bff8d7996333a9477f89931cd93b3b72a7d9d8fac4637746c
-#+patch.1e18582a339e228c44c333e8fe5e673fec1cc277cfdc756cb8b7582855184a14
-#+libunwind.033942ca796ed5e53cfa98567ee8592b1b75ceac51a16d9f8ad0e157c067b9d4
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+m4.ce5c949ddb16f3270907b044c9aa1d9441a41305256efa8f95332955db555e51
+#+patch.ea64352f820d24d1dadb99419df4729331bf853f8f8456ababa17bba53761a70
+#+libunwind.0a1d58abee78608cb59f38dddfec7f69b40a5173bc6a4303bea0b09a05f724cd
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-dosfstools.483f5bc791395406c4368f142a6af4cc2b947b8449505bfd9b993269e5e9f3ef
-#+busybox-e2fsprogs.ee57e3f1442e8a543f44ae41e1cf943c5e93a75938606096dced6d99f05a5ee1
-#+busybox-iproute2.c71c1905f5b22b859fb7cd763a23acdcd10919919642a5179b7fa1197539f0c6
-#+busybox-iputils.4f16d30f02a967c2507a48726a6accaa55e965a9fa0c1bb609859df0d0f2497f
-#+busybox-net-misc.8f9746687e4623d45c245fa2417517d295a6823fc685d2d0fb9cb997ced8f0fa
-#+busybox-net-tools.fb48cfb533e92e38af1cca4bf48239cc94c8bac3774323956c52b0d2bfea2214
-#+busybox-traceroute.53dc7c7fb92781f3230ecba7bf131e2a0e1b2ebbe9653af41ae2086a4fdc413a
-#+busybox-wget.2259b80152084e3d874240847cceb24e7e932c6738e9cbc7ac6db732dcb57da8
-#+busybox-chpst.c2f6206d421d3cbb25beff29a281896c2bc7a9cea89b4286d74cef036f58bba7
-#+busybox-console.8ed8342d6a410a7400d05131311db499e61fc78ef0b869848e273a25fd33d092
-#+busybox-getty.f12c757d92239ea0c654f858ee3b969a98dce7ca3d7e00e57e6917f00cc159b8
-#+busybox-i2c-tools.6f2ad4f2d996b06ab4c829d4887b40df3acba9c4f8058f8c75a3d799f9703452
-#+busybox-linux-extra.56d236d7f921227908f0bfa3078e4bec4381e7fe48e9276e17abbb1c11d3ea50
-#+busybox-mtd-utils.1468d491bb5710fd259bedb4716e25e8aaef2373eb0e24ab547377d490fb411c
-#+busybox-shadow.783d79257927c81ecea506d73e56f6fbf0b78213d69389327f03431f1b7dd2d5
-#+busybox-su.81d2097abc8cd164cc8b27ef94dc2027a2faf0100e561a0a75573edb83e525b6
-#+busybox-util-linux-priv.a78e11456d5b6f3d65b33024d94e0ab874168ee09597ba9bb0dd314216d15569
-#+busybox-logging.0a58c1598c49d42fff88552bd4da6231d690e9551ef8c99f106faddce3b6f395
-#+busybox-cron.0cb7fd3615f11de0f012aec2a8a98548a9ef7fc61c9565fe51c470a28de8e7b7
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+nawk.fa3a319e708ba615cea1b327b59011ccf01440eb19c8296ad754949f6dd0fe9f
-#+diffutils.53a5ebd33a6c5213495e2d633b8807c250c4b0436fc9bb981c38b2c23196f29b
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+aat.b5f223c46d05396b285e8334bb45cce6cb9f662a89eb733807f85820b12d275a
-#+fileset.2ace7fb29784e313f4dc2b83fa4125d1d0bcc73a8a5f33c164ad2fc8119dd9f4
-#+rsync.137034f429b295a367f144b53f01f4e12f8ae301a1e7d83e1604e8b20bf4832a
-#+execline.c74d67fcb3e8c5df31d31928abb5bff6d408f3668c7f90f83835e88c13ab8d75
-#+kbd.4188b2f59933fdb9ff83f3eec925b31444b445950ab8a53b0522386049fe1153
-#+mdevd.cb8c2120054601849e38e00b0e17895df189c29161e816bd750b9401ce1b5e36
-#+s6-linux-utils.3180e2da74f789508e931691e17303463f46a3d5fd76037920c25085c1c3b82f
-#+s6-rc.02a2d73c17ade5330667433eb7023da33c683260fe1987c98f06b7701ebd4e40
-#+s6.126793508d107794bfe8577d1a3fad3ee62e27222a633245465df1340f0f5823
-#+zsh.90597dd1d8fe6717e07eb26ad736cdf611ce750252fd3339e5f0c2a58a8cf497
-#+libcgroup.5332ae1e9907ff5a940ad95e9675de2cf14ddf4683afa492a1bdd7f5386877e0
-#+system-config-scripts.5d0d1940c8dc9124405c2b5bb59ccb45db6c355d0b87365fb32e90ef946f0dcf
-#+logincaps.929cb8df900637cc090705444ebf02290361ca88bb077ed866df68c2fbb61408
-#+busybox.cca6bdd43beecab0677e6c76f83173341b3c1b25c3b8d82588944f81c9c51466
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-dosfstools.1346324ba64928a546bd9ac5055f1c1ef3b70802c4ff893fdb0f09af3b763ef9
+#+busybox-e2fsprogs.ebdd30884d8f3ee772f9a7c830ec4d7d74abb76f886b7bd9616dfb7a06a57b3e
+#+busybox-iproute2.275e617e37bf212b8ec39c85bce56624c2a3664b364038a9ab09405adaae264d
+#+busybox-iputils.653daf9d0f1404b14ba7840bcc781123b144c2247e4c0aa62c6ee969e8f3b8d4
+#+busybox-net-misc.931c6c0424442edc909513373538d848a1370283b47a1df9e978276a570bd9bf
+#+busybox-net-tools.a33d2c612b8f40522d13835eae807a6683dff6d82151e04aa8a612156d5d4ccd
+#+busybox-traceroute.bc9aa2ba46b44d59785440d3ed81f2fc607dbe3fe64c280d1542f6b6830b55bd
+#+busybox-wget.47bc24dfd8887fb5f2f263adc35ddeea0e86452c95978d735ee242b760b863f1
+#+busybox-chpst.03c895e0e1320cbe1f784b43ddd8bb157a50ad9d0789661d4df8ab1e65c6af65
+#+busybox-console.4088ade3a3ec63ca41d68b45da13a2436dd9a4514a3aff8bb33533251999cb4c
+#+busybox-getty.3591ee3af405a3d60d57663f7cbcc5c9b8bef588bc0c50e33f240f7893139828
+#+busybox-i2c-tools.5f98c086ca9b85b58403233f9c25471b25abef1435412fb9632122d3a4b3fc28
+#+busybox-linux-extra.446fc73242ba2d0403c92727123091a27e1fe6827bf7bd3f64b3ca7a18d38073
+#+busybox-mtd-utils.94764e0475afd2b86ab6059367fe63ffee7d06ad542ffb24625a021fc1c6347c
+#+busybox-shadow.c48166d15ab615b62a7b1ec7ccccc14ea8d16ac7008991be030025dcdceb4004
+#+busybox-su.c904ae34bc11e8d4dc6d8e2b1bba284699b633dac60f4204915fdcb52a8a7c5e
+#+busybox-util-linux-priv.85a48e38d9652f0aa9bab84318bf2f2098b978100da481556ac7cadcedacc2d3
+#+busybox-logging.ad629aedc4a1e52f6626b977f41241dcf816999e0ab70f4c55f6bb110a426b24
+#+busybox-cron.fbe883c04f089bbd0feeef2b880f4594c7c9662cc8d854b6db725bf4b6725bcd
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+nawk.b9c1f0cbd523998e24724d9e951dfad1e638c5361fc93c29076e42e964c4acd8
+#+diffutils.3eee2e19774b5195e35e0d8d725832bd1a6e0676505154642edc6c656983d48b
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+aat.a5e24520225807f566ef10f001ef0d46125d7baffcf991120925d280cfec4867
+#+fileset.94a27bf5ea9bd2b7dabaf7b82e0da867f58fd12cdf3986352e57507eb1390ec3
+#+rsync.aaaecca924785d6a6e1a8df7805c0ee29ec44f63434ead863fdf1c9e62f91090
+#+execline.d1173f1d6b9c503c39bdf1f64572e46d4409211d577432338ddcbf377c05145d
+#+kbd.639076b0cb992eafd49b38ccf46980c6b6aa9659c3bce2255d6a5a9d4cb60bfa
+#+mdevd.aa9364e677d9f8ccc78d774a82c50c14bcd7942c831785ed0d4c9b09ff1113a8
+#+s6-linux-utils.d34d12046d9953826bbd5c60ac5261829cf3399c51b9eb2efb959c54533527f1
+#+s6-rc.e51920af4a54aa1cf9db8e4910644f950d4e45d0b00d94eefe19bb713721adb5
+#+s6.bc72d08c75a6e415c23c92aed330651f49f979b2cb1a35a70d8ad6d193b219b0
+#+zsh.92e0cd3c6ca1613b06de7e3cc3d31a8cb1939757b6af7c8d5d268c139a861bd6
+#+libcgroup.bddac61dc071d6b09a8fec11e69f3f22c258c10a47181164ffc7783defd2a625
+#+system-config-scripts.51bc431b013e3828fc0ea1472e5a41999b3e741cc8d604244e9cbe1dbf548149
+#+logincaps.91840d47a64d12d4b4f724d9fd2b2e7446c7ac3696cd25faf2673664293bd408
+#+busybox.97232e51769ad578af205cffdd8e30c208306d2ca9e61cfb02222399f03470c4
 #@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.a1129947f7433c4073c86b7bb9df80ae8c9fb7e7161a6ad4c56f3b383f4adfe5' \
-	'pthbs_path_mdevd=/home/ccx/versions/env.a7ea51b002afedf93da35baa458b9481bc07623f4d32adaf196c03b08c0d48cc' \
+	'pthbs_path_containers=/home/ccx/versions/env.95953ecc59bebe344bf41ae86782e805720c566d1da49caa461933f1cfe90d48' \
+	'pthbs_path_mdevd=/home/ccx/versions/env.148b0c47406ea10058333c104195f19fd97d13bafe6499deb7621ee0b56e0f4a' \
 	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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-dosfstools.483f5bc791395406c4368f142a6af4cc2b947b8449505bfd9b993269e5e9f3ef
-#+busybox-e2fsprogs.ee57e3f1442e8a543f44ae41e1cf943c5e93a75938606096dced6d99f05a5ee1
-#+busybox-iproute2.c71c1905f5b22b859fb7cd763a23acdcd10919919642a5179b7fa1197539f0c6
-#+busybox-iputils.4f16d30f02a967c2507a48726a6accaa55e965a9fa0c1bb609859df0d0f2497f
-#+busybox-net-misc.8f9746687e4623d45c245fa2417517d295a6823fc685d2d0fb9cb997ced8f0fa
-#+busybox-net-tools.fb48cfb533e92e38af1cca4bf48239cc94c8bac3774323956c52b0d2bfea2214
-#+busybox-traceroute.53dc7c7fb92781f3230ecba7bf131e2a0e1b2ebbe9653af41ae2086a4fdc413a
-#+busybox-wget.2259b80152084e3d874240847cceb24e7e932c6738e9cbc7ac6db732dcb57da8
-#+busybox-chpst.c2f6206d421d3cbb25beff29a281896c2bc7a9cea89b4286d74cef036f58bba7
-#+busybox-console.8ed8342d6a410a7400d05131311db499e61fc78ef0b869848e273a25fd33d092
-#+busybox-getty.f12c757d92239ea0c654f858ee3b969a98dce7ca3d7e00e57e6917f00cc159b8
-#+busybox-i2c-tools.6f2ad4f2d996b06ab4c829d4887b40df3acba9c4f8058f8c75a3d799f9703452
-#+busybox-linux-extra.56d236d7f921227908f0bfa3078e4bec4381e7fe48e9276e17abbb1c11d3ea50
-#+busybox-mtd-utils.1468d491bb5710fd259bedb4716e25e8aaef2373eb0e24ab547377d490fb411c
-#+busybox-shadow.783d79257927c81ecea506d73e56f6fbf0b78213d69389327f03431f1b7dd2d5
-#+busybox-su.81d2097abc8cd164cc8b27ef94dc2027a2faf0100e561a0a75573edb83e525b6
-#+busybox-util-linux-priv.a78e11456d5b6f3d65b33024d94e0ab874168ee09597ba9bb0dd314216d15569
-#+busybox-logging.0a58c1598c49d42fff88552bd4da6231d690e9551ef8c99f106faddce3b6f395
-#+busybox-cron.0cb7fd3615f11de0f012aec2a8a98548a9ef7fc61c9565fe51c470a28de8e7b7
-#+s6.126793508d107794bfe8577d1a3fad3ee62e27222a633245465df1340f0f5823
-#+s6-rc.02a2d73c17ade5330667433eb7023da33c683260fe1987c98f06b7701ebd4e40
-#+s6-portable-utils.bbb7e293358143db2ea13ac9e770dabce1c1c68441c580e0f131f2783e699490
-#+s6-linux-init.8ca5e2fc3fc64cdfe51fab732d41e7e026520097e4069ab5c78c01e9f42efdbe
-#+execline.c74d67fcb3e8c5df31d31928abb5bff6d408f3668c7f90f83835e88c13ab8d75
-#+system-config-rc.9dcb83b853ce9ee19f7497d6b2026fac8834018c94f1cce8a8b4e5ec419aaae0
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-dosfstools.1346324ba64928a546bd9ac5055f1c1ef3b70802c4ff893fdb0f09af3b763ef9
+#+busybox-e2fsprogs.ebdd30884d8f3ee772f9a7c830ec4d7d74abb76f886b7bd9616dfb7a06a57b3e
+#+busybox-iproute2.275e617e37bf212b8ec39c85bce56624c2a3664b364038a9ab09405adaae264d
+#+busybox-iputils.653daf9d0f1404b14ba7840bcc781123b144c2247e4c0aa62c6ee969e8f3b8d4
+#+busybox-net-misc.931c6c0424442edc909513373538d848a1370283b47a1df9e978276a570bd9bf
+#+busybox-net-tools.a33d2c612b8f40522d13835eae807a6683dff6d82151e04aa8a612156d5d4ccd
+#+busybox-traceroute.bc9aa2ba46b44d59785440d3ed81f2fc607dbe3fe64c280d1542f6b6830b55bd
+#+busybox-wget.47bc24dfd8887fb5f2f263adc35ddeea0e86452c95978d735ee242b760b863f1
+#+busybox-chpst.03c895e0e1320cbe1f784b43ddd8bb157a50ad9d0789661d4df8ab1e65c6af65
+#+busybox-console.4088ade3a3ec63ca41d68b45da13a2436dd9a4514a3aff8bb33533251999cb4c
+#+busybox-getty.3591ee3af405a3d60d57663f7cbcc5c9b8bef588bc0c50e33f240f7893139828
+#+busybox-i2c-tools.5f98c086ca9b85b58403233f9c25471b25abef1435412fb9632122d3a4b3fc28
+#+busybox-linux-extra.446fc73242ba2d0403c92727123091a27e1fe6827bf7bd3f64b3ca7a18d38073
+#+busybox-mtd-utils.94764e0475afd2b86ab6059367fe63ffee7d06ad542ffb24625a021fc1c6347c
+#+busybox-shadow.c48166d15ab615b62a7b1ec7ccccc14ea8d16ac7008991be030025dcdceb4004
+#+busybox-su.c904ae34bc11e8d4dc6d8e2b1bba284699b633dac60f4204915fdcb52a8a7c5e
+#+busybox-util-linux-priv.85a48e38d9652f0aa9bab84318bf2f2098b978100da481556ac7cadcedacc2d3
+#+busybox-logging.ad629aedc4a1e52f6626b977f41241dcf816999e0ab70f4c55f6bb110a426b24
+#+busybox-cron.fbe883c04f089bbd0feeef2b880f4594c7c9662cc8d854b6db725bf4b6725bcd
+#+s6.bc72d08c75a6e415c23c92aed330651f49f979b2cb1a35a70d8ad6d193b219b0
+#+s6-rc.e51920af4a54aa1cf9db8e4910644f950d4e45d0b00d94eefe19bb713721adb5
+#+s6-portable-utils.695ede508f04e899bd2c525709d1c5c7c33fad886a189ccd268aee79b364b35a
+#+s6-linux-init.d274584f1011f8587db4f49c5d632567e09e70256895408b60941310b3cb207e
+#+execline.d1173f1d6b9c503c39bdf1f64572e46d4409211d577432338ddcbf377c05145d
+#+system-config-rc.3e9471a5f817bd51ee9c5d7efb43bee5e74d67e86d2e8f0074dafa6c3703a209
 
 
 # - build script start -
@@ -76,7 +76,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-s6rcdb=/home/ccx/versions/system-config-rc.9dcb83b853ce9ee19f7497d6b2026fac8834018c94f1cce8a8b4e5ec419aaae0/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.3e9471a5f817bd51ee9c5d7efb43bee5e74d67e86d2e8f0074dafa6c3703a209/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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+s6-rc.02a2d73c17ade5330667433eb7023da33c683260fe1987c98f06b7701ebd4e40
-#+fileset.2ace7fb29784e313f4dc2b83fa4125d1d0bcc73a8a5f33c164ad2fc8119dd9f4
-#+system-config.6ed3d72471e4bf8553b5baf423c0d9ad64198462e9af284d9fd5f1604b0b1a83
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+s6-rc.e51920af4a54aa1cf9db8e4910644f950d4e45d0b00d94eefe19bb713721adb5
+#+fileset.94a27bf5ea9bd2b7dabaf7b82e0da867f58fd12cdf3986352e57507eb1390ec3
+#+system-config.2cae00742681b8d6c0ebd019856fbee6377c17aeed8be3f56f3b031645548e58
 
 
 # - build script start -
@@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-src=/home/ccx/versions/system-config.6ed3d72471e4bf8553b5baf423c0d9ad64198462e9af284d9fd5f1604b0b1a83/config/s6-rc-source
+src=/home/ccx/versions/system-config.2cae00742681b8d6c0ebd019856fbee6377c17aeed8be3f56f3b031645548e58/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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+zsh.90597dd1d8fe6717e07eb26ad736cdf611ce750252fd3339e5f0c2a58a8cf497
-#+pthbs-banginstall.8dfc859346ef41972e22d44f2e3702eef0a29209e17bdd324e1c0fc46ed98c2e
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+zsh.92e0cd3c6ca1613b06de7e3cc3d31a8cb1939757b6af7c8d5d268c139a861bd6
+#+pthbs-banginstall.72ccb0bd87c499a76481aad1c328a420191befb263be9bf0bb17b827e6aa8ca6
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+zsh.90597dd1d8fe6717e07eb26ad736cdf611ce750252fd3339e5f0c2a58a8cf497
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+zsh.92e0cd3c6ca1613b06de7e3cc3d31a8cb1939757b6af7c8d5d268c139a861bd6
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
 #@untar:-z:sha256:f3ae622c765db4e0d791ea90a9feba39d7f693ef9cb949a797f7ad6b404a2d61:.
 
 
diff --git a/variants/ccx-x86_64/toolchain.environment b/variants/ccx-x86_64/toolchain.environment
@@ -0,0 +1,4 @@
+#!/usr/bin/env pthbs-build
+#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
+#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
+#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7+
\ No newline at end of file
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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+execline.c74d67fcb3e8c5df31d31928abb5bff6d408f3668c7f90f83835e88c13ab8d75
-#+pthbs-banginstall.8dfc859346ef41972e22d44f2e3702eef0a29209e17bdd324e1c0fc46ed98c2e
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+execline.d1173f1d6b9c503c39bdf1f64572e46d4409211d577432338ddcbf377c05145d
+#+pthbs-banginstall.72ccb0bd87c499a76481aad1c328a420191befb263be9bf0bb17b827e6aa8ca6
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-dosfstools.483f5bc791395406c4368f142a6af4cc2b947b8449505bfd9b993269e5e9f3ef
-#+busybox-e2fsprogs.ee57e3f1442e8a543f44ae41e1cf943c5e93a75938606096dced6d99f05a5ee1
-#+busybox-iproute2.c71c1905f5b22b859fb7cd763a23acdcd10919919642a5179b7fa1197539f0c6
-#+busybox-iputils.4f16d30f02a967c2507a48726a6accaa55e965a9fa0c1bb609859df0d0f2497f
-#+busybox-net-misc.8f9746687e4623d45c245fa2417517d295a6823fc685d2d0fb9cb997ced8f0fa
-#+busybox-net-tools.fb48cfb533e92e38af1cca4bf48239cc94c8bac3774323956c52b0d2bfea2214
-#+busybox-traceroute.53dc7c7fb92781f3230ecba7bf131e2a0e1b2ebbe9653af41ae2086a4fdc413a
-#+busybox-wget.2259b80152084e3d874240847cceb24e7e932c6738e9cbc7ac6db732dcb57da8
-#+busybox-chpst.c2f6206d421d3cbb25beff29a281896c2bc7a9cea89b4286d74cef036f58bba7
-#+busybox-console.8ed8342d6a410a7400d05131311db499e61fc78ef0b869848e273a25fd33d092
-#+busybox-getty.f12c757d92239ea0c654f858ee3b969a98dce7ca3d7e00e57e6917f00cc159b8
-#+busybox-i2c-tools.6f2ad4f2d996b06ab4c829d4887b40df3acba9c4f8058f8c75a3d799f9703452
-#+busybox-linux-extra.56d236d7f921227908f0bfa3078e4bec4381e7fe48e9276e17abbb1c11d3ea50
-#+busybox-mtd-utils.1468d491bb5710fd259bedb4716e25e8aaef2373eb0e24ab547377d490fb411c
-#+busybox-shadow.783d79257927c81ecea506d73e56f6fbf0b78213d69389327f03431f1b7dd2d5
-#+busybox-su.81d2097abc8cd164cc8b27ef94dc2027a2faf0100e561a0a75573edb83e525b6
-#+busybox-util-linux-priv.a78e11456d5b6f3d65b33024d94e0ab874168ee09597ba9bb0dd314216d15569
-#+busybox-logging.0a58c1598c49d42fff88552bd4da6231d690e9551ef8c99f106faddce3b6f395
-#+busybox-cron.0cb7fd3615f11de0f012aec2a8a98548a9ef7fc61c9565fe51c470a28de8e7b7
-#+attr.d204bb80bf61529b59d348ca3803f8927ff0ea3e87da60dcd15983b5060587f4
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+diffutils.53a5ebd33a6c5213495e2d633b8807c250c4b0436fc9bb981c38b2c23196f29b
-#+patch.1e18582a339e228c44c333e8fe5e673fec1cc277cfdc756cb8b7582855184a14
-#+flex.1a06937ef4535d1c53a570e6211eef846b6f1f1d94aeda79733a9b3aea61208d
-#+bison.53ad5d8cd8308bc9731fbbfdf6a9de7d074c82cd022a7e1f80b42c525257dfe7
-#+rsync.137034f429b295a367f144b53f01f4e12f8ae301a1e7d83e1604e8b20bf4832a
-#+execline.c74d67fcb3e8c5df31d31928abb5bff6d408f3668c7f90f83835e88c13ab8d75
-#+s6.126793508d107794bfe8577d1a3fad3ee62e27222a633245465df1340f0f5823
-#+s6-rc.02a2d73c17ade5330667433eb7023da33c683260fe1987c98f06b7701ebd4e40
-#+s6-portable-utils.bbb7e293358143db2ea13ac9e770dabce1c1c68441c580e0f131f2783e699490
-#+s6-linux-utils.3180e2da74f789508e931691e17303463f46a3d5fd76037920c25085c1c3b82f
-#+s6-linux-init.8ca5e2fc3fc64cdfe51fab732d41e7e026520097e4069ab5c78c01e9f42efdbe
-#+mdevd.cb8c2120054601849e38e00b0e17895df189c29161e816bd750b9401ce1b5e36
-#+s6-dns.59cae072cf0a672e10ba0d3af582fa46ef0c5a62801008e74dd914fe6b1a8bae
-#+libressl.9bb98ac5f3b2f7f0d13d3ad47144ab754d4ae4eb5054cdbd0c53cd8430d75f3c
-#+s6-networking.1fead68720f00389d629e5ab5854bc6caa67bfd9563442166b9f9b2f8db2d997
-#+zsh.90597dd1d8fe6717e07eb26ad736cdf611ce750252fd3339e5f0c2a58a8cf497
-#+pthbs-banginstall.8dfc859346ef41972e22d44f2e3702eef0a29209e17bdd324e1c0fc46ed98c2e
-#+aat.b5f223c46d05396b285e8334bb45cce6cb9f662a89eb733807f85820b12d275a
-#+confz.2dbf7af32919548c394e8fbd369e140edbb95541b4bb0408733cd9b4db091aa8
-#+containers.08b087a142714adf8c15f69e72e2d4c17a4d3934b25c2d8955272179b54bcad2
-#+fileset.2ace7fb29784e313f4dc2b83fa4125d1d0bcc73a8a5f33c164ad2fc8119dd9f4
-#+logincaps.929cb8df900637cc090705444ebf02290361ca88bb077ed866df68c2fbb61408
-#+snaprep.8d18cdcaa76a79b1ba661cd20b579f35ab167b1901e03702a2a74c414d006eb8
-#+curl.8a746038e1271f57cb3b2b13f6f117e52754a923e9c011c7c072a82b8b505900
-#+git.5b00b85bef8734fde3733a6940e81f3b5a7b8319011224d8bc75b2cde44433bf
-#+xbps.da28d960e0ded265b5885f25de302531ba4bed623d36fe1b34648ed37b1756ed
-#+apk-tools.22c760b03bb82973f79c5cc5256347c4b9ab45d8a43c7697e0150f288f0d4f2c
-#+getent.a7db0ccfa535f63ece97aba9549bdb04f4515e00287c685d359caa2b196c7b45
-#+getconf.8a0ba3ae885e5d50ecfa2325883f22f98feb0604101d5fb1fee86eaf0280535f
-#+iconv.0afb759181872edb80870b58de5bb3aa3b565500139d401f1a7028b7968a30dd
-#+libcap.3e1e66c3e2134bcfc34177ecc0bf7e79f1327cadcb2664d3a25a7a4464e3f63c
-#+applyuidgid-caps.f96c2673c35845624d229daf71c745c73863e9685c4e69f9044a2275bdfdc8c3
-#+ccx-utils.fcde5ec2b8c9b8033b27a5d5a9861d3651a3d946f15cecd310dede6dfe918949
-#+user-env.44038282a0b65f6024dbbc43b66dcde6bd113733402f57ddad59d77ff83347b1
-#+strace.95b6d159131ea16d5d672dc4deb09b8f05aa7344923a8f26ec2cb5743d6ae387
-#+mlog.2c437ba777c7a750705df88a3bb6049aadd9831703ccbd798bcbd38fcad8f390
-#+findutils.72e365d624cffa984e3b0150fffe0d4a37c6372cf8c9acb31cfdfb82207c366f
-#+nawk.fa3a319e708ba615cea1b327b59011ccf01440eb19c8296ad754949f6dd0fe9f
-#+nvi.6b9bd5b7270258bc87b1b767099a312c0d49c7eef144388c80ff1e3ed62ee013
-#+squashfs-tools.5aea1ad0e0e717f33138bc6ff16f652bbb2f61067cd2ce44035dd165865a920a
-#+mandoc.5060d2f3fad9c517dcf1e6d4ca71eaa3d4c28a914556204605f814dca42e7117
-#+tinyssh.5371c1147acba94efe20aa81c7084232854daaeeabea142826838c3200145ab4-
\ No newline at end of file
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-dosfstools.1346324ba64928a546bd9ac5055f1c1ef3b70802c4ff893fdb0f09af3b763ef9
+#+busybox-e2fsprogs.ebdd30884d8f3ee772f9a7c830ec4d7d74abb76f886b7bd9616dfb7a06a57b3e
+#+busybox-iproute2.275e617e37bf212b8ec39c85bce56624c2a3664b364038a9ab09405adaae264d
+#+busybox-iputils.653daf9d0f1404b14ba7840bcc781123b144c2247e4c0aa62c6ee969e8f3b8d4
+#+busybox-net-misc.931c6c0424442edc909513373538d848a1370283b47a1df9e978276a570bd9bf
+#+busybox-net-tools.a33d2c612b8f40522d13835eae807a6683dff6d82151e04aa8a612156d5d4ccd
+#+busybox-traceroute.bc9aa2ba46b44d59785440d3ed81f2fc607dbe3fe64c280d1542f6b6830b55bd
+#+busybox-wget.47bc24dfd8887fb5f2f263adc35ddeea0e86452c95978d735ee242b760b863f1
+#+busybox-chpst.03c895e0e1320cbe1f784b43ddd8bb157a50ad9d0789661d4df8ab1e65c6af65
+#+busybox-console.4088ade3a3ec63ca41d68b45da13a2436dd9a4514a3aff8bb33533251999cb4c
+#+busybox-getty.3591ee3af405a3d60d57663f7cbcc5c9b8bef588bc0c50e33f240f7893139828
+#+busybox-i2c-tools.5f98c086ca9b85b58403233f9c25471b25abef1435412fb9632122d3a4b3fc28
+#+busybox-linux-extra.446fc73242ba2d0403c92727123091a27e1fe6827bf7bd3f64b3ca7a18d38073
+#+busybox-mtd-utils.94764e0475afd2b86ab6059367fe63ffee7d06ad542ffb24625a021fc1c6347c
+#+busybox-shadow.c48166d15ab615b62a7b1ec7ccccc14ea8d16ac7008991be030025dcdceb4004
+#+busybox-su.c904ae34bc11e8d4dc6d8e2b1bba284699b633dac60f4204915fdcb52a8a7c5e
+#+busybox-util-linux-priv.85a48e38d9652f0aa9bab84318bf2f2098b978100da481556ac7cadcedacc2d3
+#+busybox-logging.ad629aedc4a1e52f6626b977f41241dcf816999e0ab70f4c55f6bb110a426b24
+#+busybox-cron.fbe883c04f089bbd0feeef2b880f4594c7c9662cc8d854b6db725bf4b6725bcd
+#+attr.0dcc626b099c772eca39d1153c15b37543b5546538555195d29742eafc32d56a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+diffutils.3eee2e19774b5195e35e0d8d725832bd1a6e0676505154642edc6c656983d48b
+#+patch.ea64352f820d24d1dadb99419df4729331bf853f8f8456ababa17bba53761a70
+#+flex.e9b2dbbd6977615d0e14d817adccfb842774fe78b6e561fe0201bc930bf6643c
+#+bison.74d96290385c947d867923bf3fbe15e75990583876f7f280db218771852c63ee
+#+rsync.aaaecca924785d6a6e1a8df7805c0ee29ec44f63434ead863fdf1c9e62f91090
+#+execline.d1173f1d6b9c503c39bdf1f64572e46d4409211d577432338ddcbf377c05145d
+#+s6.bc72d08c75a6e415c23c92aed330651f49f979b2cb1a35a70d8ad6d193b219b0
+#+s6-rc.e51920af4a54aa1cf9db8e4910644f950d4e45d0b00d94eefe19bb713721adb5
+#+s6-portable-utils.695ede508f04e899bd2c525709d1c5c7c33fad886a189ccd268aee79b364b35a
+#+s6-linux-utils.d34d12046d9953826bbd5c60ac5261829cf3399c51b9eb2efb959c54533527f1
+#+s6-linux-init.d274584f1011f8587db4f49c5d632567e09e70256895408b60941310b3cb207e
+#+mdevd.aa9364e677d9f8ccc78d774a82c50c14bcd7942c831785ed0d4c9b09ff1113a8
+#+s6-dns.55f6f468259a0d730745d851f28ed9d0acb72e63303bbd1e81e87c2e43890cba
+#+libressl.29616f3b1231a76497df505bc1e977386d4370a00f49cbe58d03ea6b5ac7d1ce
+#+s6-networking.65035451fb55178a31a6a751a0b64c138c8af952eddb605445e5ea1ce28f1e24
+#+zsh.92e0cd3c6ca1613b06de7e3cc3d31a8cb1939757b6af7c8d5d268c139a861bd6
+#+pthbs-banginstall.72ccb0bd87c499a76481aad1c328a420191befb263be9bf0bb17b827e6aa8ca6
+#+aat.a5e24520225807f566ef10f001ef0d46125d7baffcf991120925d280cfec4867
+#+confz.5bf78df9a4bf16334fa685fd53a6a32fe8227dbe8648d5b6e65834e39e65fac2
+#+containers.f855f903440b941f07475a8e753b32a0917feb9dd8bd67064c06373de2c729b1
+#+fileset.94a27bf5ea9bd2b7dabaf7b82e0da867f58fd12cdf3986352e57507eb1390ec3
+#+logincaps.91840d47a64d12d4b4f724d9fd2b2e7446c7ac3696cd25faf2673664293bd408
+#+snaprep.acd7599a6ff35bafb1406c9b314069fc662be777be0eed098394223f58384327
+#+curl.868a0f8e2ac114eca9f0294c3726d45c1dbfbf503792f888b5f4b1eebe161119
+#+git.7faa6517dae786aa5c8ba62c6c0baf7e404d6d7a5853f0719f6b0f4d3d2ba62b
+#+xbps.b9295697b82372f5bdc1666c58e47334e46c62ab429c916869355c3d39c943b5
+#+apk-tools.97e9a9204db2ec8639621204c1372b9547378dce6d4bf6c15d758a8493ab5969
+#+getent.c3991c80f77c3256e0920bde235a7480c9fc1f8e7de687b0ba9d8cbcc160f736
+#+getconf.c026a1310708f63a014f655316c6de232ab07ceaaaf44e29961f933eaa93b359
+#+iconv.027052011b7d69848afc88307f8d13de668dc85090b0c9621d72354ad964b7c9
+#+libcap.5f1555d9d3876bf9c61303962861320d5546cea71a6e3578779de18b0e717dbb
+#+applyuidgid-caps.12daf988ea7db38558721928ad01f478a92ab73ce990fde2326eae3452670b83
+#+ccx-utils.c1307f49d3eaa7384d15e2223d593802050a305f9b827e260dfd38c8955af26f
+#+user-env.a69597bb779def38655c07dd0be8c2c7372c10b635298b4e839230a53484386b
+#+strace.1aea094fc5d71f8db44b5675cba24ac415231370ef59ae4a5232285cbfde8bf6
+#+mlog.380b007a3966644de12f7e47647e9b531bd2346250f3c2d36e72eb09692464d8
+#+findutils.cf8d24f48a56e0b345b17c3e74ac179b59056795e32be68564cb224d2c0d010e
+#+nawk.b9c1f0cbd523998e24724d9e951dfad1e638c5361fc93c29076e42e964c4acd8
+#+nvi.87664d4b59207baebb77663a484828594a39b5ae11af0745c63c4c5438e82c3f
+#+squashfs-tools.6ec71a7c83e35620a37a9da6809195c37f3cdb1ca213dcf4039351bd6ae4ceaa
+#+mandoc.3470b7cb75b1989703d26bfcdcb226ca478e986f7dcc6df1054b49ac81c3107d
+#+tinyssh.ee02b830050fd1fe59a2b9f9e6c02a7c8bfbd3b2eb4a34d9e9bda6614fc9c88f+
\ 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.eb1e90061c3a29d4b6a6c2abc33fe8adb86d4e0774ec76bde90df614fcf8d48a-
\ No newline at end of file
+#+linux-qemu-guest.39ede5e4e149867aae9536deda9c7842678b57a33337402467f1ebe10c541899+
\ 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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+libarchive.6a94fe85d48b28c2b241eb8876f5953b9235c5ff6771e3f92516f948b81d5a5e
-#+libressl.9bb98ac5f3b2f7f0d13d3ad47144ab754d4ae4eb5054cdbd0c53cd8430d75f3c
-#+pkgconf-pkg-config.2e9d10c7f76b599549416535a5a954360de6d72e83325e765e8e87ba09a1e5bd
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+libarchive.13fa4b103642283e09ede4fbc173ba6e851a0910b6b73a9239f59077237d668a
+#+libressl.29616f3b1231a76497df505bc1e977386d4370a00f49cbe58d03ea6b5ac7d1ce
+#+pkgconf-pkg-config.649101966a931efbc37a3a66a1b67ef5491d924efe224643176452041e4584d7
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+m4.f9b2fbfe5dcb1c1bff8d7996333a9477f89931cd93b3b72a7d9d8fac4637746c
-#+netbsd-curses.8ae0f616ad1d23567f9e89826e70983f8c611799e179901c4f1601ed5f74f8b5
-#+libbsd.98006744c87f8fdda4ad53c0690a6b88f9610cc771d8e7683d918cb779d2b921
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+m4.ce5c949ddb16f3270907b044c9aa1d9441a41305256efa8f95332955db555e51
+#+netbsd-curses.ab9d249042cd6f044a368cd1697e8e22b94d06657e0be86b739ef2d0e846714b
+#+libbsd.8eb74ec4cd5980865d45b48e7522021bb152cb528cb8bd43b58712ed5947b791
 #@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.da62d55a94e2dcfebe3681861d53e0a2d35b3b176a69f28fdac5f0a82a8054fe
-#+busybox-bzip2.311dd4c8147e0e0123c88a9eafa94f1f35a426a7820aca9e467b1b3eec30e091
-#+busybox-gzip.4ae6d42831656676d20685f5f4ecba14b524204dfa4c1a85a09b9ed4f1c55e55
-#+busybox-lzop.3198abbf5870696545f40ca2bcb24727846006cb1b2ac32768bdcce9f234f647
-#+busybox-unzip.7586c45cadbf66d90d535eec42794ffffcc4c7f08e40a37a7e5dae98c5282b96
-#+busybox-xz.98784510a9715dd20326356f8cf751e29b96f5b1181653af45bbfe2849e38731
-#+busybox-cpio.0b54605460bd2b18dbc4fbc40b427296c19a7e64f337cc2b9b361ad851885711
-#+busybox-dpkg.0e8cdf60bd2ef94953492c81eeec3e04b3963570ef01da75a779bed421fa9eff
-#+busybox-rpm.50bc09e5874f2040a0c603ac772e2cd5d74938881bf2963719f2d33360887473
-#+busybox-tar.fa45403a091602a6f565bcb7026e0bae4a8f4d34a24485eaa568a3686da32208
-#+busybox-ed.94f8a7af773ec6f87d22111631ab04d451c14138478c010ba4b8b8cace040d31
-#+busybox-sed.8b1500afea7406ce5e6f2321588202cd1ad9140b51c8f51c68a2b7ceaa95c70c
-#+busybox-vi.3af50e7a1dadc50e2fd23cb020c9629c444a7e204ff203560d59822e377841d9
-#+busybox-xxd.8d4d59a1a70a9fe8df449354310b2605f66efc39d0883d77f77ded30946c1b99
-#+busybox-process-extra.ed172f5f0577efe97583c9d4c19e3b9d421f373f8cd0192582db26631f3b89dd
-#+busybox-procps.e013fd0325c75292b6c5a3319ba9eb1befd210f5c738d63e6c75d240112eb76f
-#+busybox-psmisc.e56af0702300d28fd0fd0866a1ac4d6a7b8b962357d8e26afb64e7209d05cc57
-#+busybox-ash.4fbead6719ec81dc4fdf6af151315c45a6f6394070510944e6618e8e1ec7c0ae
-#+busybox-bc.8adced3ea77c093f51c539e7754b1fb9eca006291c6ceb16d6ee7146f9a68cc5
-#+busybox-coreutils.8eece6250c0bbfbf067c6704f9254ba89aa80735ed72b592de7b7be7acb72bdb
-#+busybox-coreutils-extra.95d826c53dcc26601343c872141fe5d83428f9391d94a670d14647075d31e861
-#+busybox-daemontools.3d602e5c82a81b65306416f5f4d9e9372b935b4bd3242b751e7b36c656ba62c2
-#+busybox-grep.3b494dc63efdff5e76e542ec38cf6d223e26b062ca9c5b478a9f052d2cf3a7fe
-#+busybox-misc.bd108e767bbb8034221ccbf71a5f8712569d04742ce3738e075e47b497e9b084
-#+busybox-sh.1d3faca97ade74f1fb3b75cf57aa4ff498c7e2eef5f255f469f66f99a90dff0a
-#+busybox-util-linux-unpriv.3d3459edf10a642a047852ebc9093b29a4e3cc8d2850657511bda0b3fc73b80b
-#+busybox-findutils.e57f98b698106b3d7d5f55bdb684c81c95d33bc23ac5e002a0631845e8b3cfe8
-#+busybox-awk.9743e2c5f7d45ba217b3553b018046a3d414f2f95d5664f8c48681564c17d4c1
-#+musl.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
-#+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7
-#+gnu-make.6dee2f9f8adab2400467ece4b551b7ff4f76185a5c99b717e2356be1f2ea05a5
-#+busybox-diffutils.e954ab8e7d78763049bc74bd4ad3050915c36c84227b7fa0e9a2085cd6657dec
+#+busybox.735320ae74c2615a59e8fa0251d94da1d6e11bc1437abe3020279dfce8d4a8a4
+#+busybox-bzip2.cfe84090d9afc7d4710951dc235d6db9d198aebdac48f7accee748090f824be2
+#+busybox-gzip.dec86977f55508e4f16fe416f1eab08348875268e8ac18514f917854efaf2f17
+#+busybox-lzop.6251d590ef741432e3cfc72e41df779ebc6b61ee12314bf3d08928032209d749
+#+busybox-unzip.eda340aa7e53e1755861625a5fae589f7f43df5e9df1a679a7ddecbf6a816e0f
+#+busybox-xz.55cb3968328ef20a860aea004d41a9ca487717804898788beb754ec0fed0e526
+#+busybox-cpio.9e1736d463bcb86d5035ef53de8c7affb6ec45015dd520dfed8f7f7537c23afb
+#+busybox-dpkg.2d3171ddd26445fc529594c99adfc2849c9381a43eb9a11d777827e7996f80ab
+#+busybox-rpm.de06a117a8c38fdf93b2520513fd8a38a2572a66eff85257419c36de6bb080ac
+#+busybox-tar.ddb35971c73b8d1aa1bc2ef0e4c94eab9e7dc562d53fd4b5fd1a242147561818
+#+busybox-ed.edc8421e4dafd2373d56b8a976753c6bff73662c8ca60eaa9bb60fd55400cbf0
+#+busybox-sed.8ebac7d2bc0fe132bd85e6ad20971a2e95d8bb039a029cf16785de2a421280ea
+#+busybox-vi.b31874d03a0fa8f11fdcbb1475b5cb773f156bda82c86605816f62b746e19dc6
+#+busybox-xxd.369a1008ca19060c51115878effd1eb1f1687eb61b508f404a9c8952b3c6c18c
+#+busybox-process-extra.cbf3c2ec618a821533bfda9d3032d109585c0e204df08474d4209de6c70f43f6
+#+busybox-procps.1cbd2cc3527e803dc88a28b42a43d2daadc7924c69dc24a0b6a5b11bb3d72c5f
+#+busybox-psmisc.0484f80ca1f18afa04aafbada162fd2545e0a5cf646152d3d3095f6175eae50e
+#+busybox-ash.f7a9cda4941402eae3590da65c2131122a8d3fb0a798b00900c73fde8b492c6d
+#+busybox-bc.76aecf52776967a03872f3c402bcded1c6953fabdc38a30eb49e013fa7a3306c
+#+busybox-coreutils.82272dc7fe08507e2f049695016e57e03fd14fd9be32a03bba9a255f5f8c5323
+#+busybox-coreutils-extra.8f2de631fc52915d7eb422b423e683d6481b3dffdc946319e3affe53336115f8
+#+busybox-daemontools.26dee09686740589927a868d120be39ca0756467a0ead776e2fe171338fcf2ce
+#+busybox-grep.a3e09c7260564da0065e1d560f6dd88e36737077767fa254b1d6582e841a0ec0
+#+busybox-misc.a4a8be6fa08caaa822595ae1aa5f562ef51cca2b855eef526465fd0d15026315
+#+busybox-sh.c363fb4cc700cb1210e6071b2ea2f7a660ad9540f59c89a9d2438847dcdd6632
+#+busybox-util-linux-unpriv.c3412078a974d41715f3b4a20719a3e53430afb440f4fc3affe700e2d2585758
+#+busybox-findutils.a80ac109947eac26b9380912d973b08dbe0416b697044f4d2dc8273fc96a6bcb
+#+busybox-awk.839e23204ef9cce62a6982d55e7c4dc59239a5ce9d200c33c9a7a0563bb945ad
+#+musl-cross-make.c55ada9906dc7be5f2ac9aa9976d669b6b5f9a8ad4fc357b903d7ac67860ba0a
+#+gnu-make.e111df57b955a36bb1ba13ee41cd1e23b7f6a6f4de8436809a580c5c3cce78e8
+#+busybox-diffutils.31045ba7ccd1693d04ffb9e69bd77161315948eaf59a1e14238d5f8229a42753
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+zsh.491fef7a15462a76f8cb84640d3127c4654aacebd87064bd3e486e81c5b8f397
-#+pthbs-banginstall.d123c717dcdbde6e3fca02bfe008b86639549ef95fa48b303ee0a31b778e6a79
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+zsh.253499e46e90e47c8bf3342e6fe39cabf18532fc150b6da2ce0418aef3287c67
+#+pthbs-banginstall.22166fce84053bfb8337f83bf61b27e7a839dcf642aa08b93ea3575b5b97fc37
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+patch.b094bff23ba91b83014fa4913272d726f6d454161c0eaf92e3034ff0bf41d4ed
-#+libressl.b4bccfabdae12bd61d28f482e64cdc9789cc45698f4aa8a0108b01a667b06034
-#+zstd.c25185f0b25386e2ad693c76b6f644050ed5cc03cd0830a7e11bbb7de560b519
-#+pkgconf-pkg-config.d629fe0658f1e8f1ab46f13600c9a6801bea74c41fa457e2cb69b00f98f13c8b
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+patch.8e0c7cb577376dc28779fc98e3fca226002f90fbd8f71a592926d4f92023afab
+#+libressl.cfc609041b4eb1c994e2429d12fd2f73dff8ce206109924ff014850f1c4f40e3
+#+zstd.fdf9bf1f2931783deccfbb1ac6eeddd10f0ee96cbbd60bed4a8a2b377bdfa60b
+#+pkgconf-pkg-config.660b67bb60a770fe6a8b683681d667691eb85f0c8f5690b9fc813daefb723bfb
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+skalibs.787f60b4d32f3e72df949c0038350cc0d9b245c09a9912a8d1d2bade9f578f73
-#+libcap.746b05f72aa151abe54c9d50f8746b3d575c22b3206b4b2f665ae8ac42f01b56
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+skalibs.fbcd4d1b74a23b27ad4dd4830c82b6b34df76ed3819fd9a523d80daac8bc5988
+#+libcap.816074859b54c507a8120c3a4a870e10fd80ea89831f2b01dbcc596ddc542c61
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+m4.6849dbf93ae1e108ae2029f7ced6c362830a26043691660f27adc424742fa16a
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+m4.993015f9bbec4bb286bd6ca07fef1e92776574dd009b502a0694e022314804cf
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+m4.6849dbf93ae1e108ae2029f7ced6c362830a26043691660f27adc424742fa16a
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+m4.993015f9bbec4bb286bd6ca07fef1e92776574dd009b502a0694e022314804cf
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+m4.6849dbf93ae1e108ae2029f7ced6c362830a26043691660f27adc424742fa16a
-#+flex.7c2d2d543e2abf524bbdc174157583de0100e00f69dc915a562bcfe14624b0ed
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+m4.993015f9bbec4bb286bd6ca07fef1e92776574dd009b502a0694e022314804cf
+#+flex.6cd3baf9c0d9c22fca00e961aef92d0f435cc95be91ddd284a9b670549b4ad38
 #@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.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
 #+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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox:old b/variants/root-x86_64/busybox:old
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.521ed668f18e5a89c45bcb2cd229f293cbdcae8b2e3650002cfa0c37ada9009e
-#+gnu-make.660bdddbe6db0afa21a50e6c13cabc7fc14f8ea2dbe29ab2fe0ce8639b085b2d
-#+busybox.8b6145faa03d2459be5dcb6fe35da12c53ceec094ac0b689fb6cf7212c227497
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.2ff3aad4abc49ad3e4983ee16ba0d31b8776a3b1c8f3d8f0d9ea20171d18130f
+#+busybox.894b0a70452d0be23fe59c0c800bb70ab40bf642db18fea7e354ad5a42052b8e
 #@sha256:31b8f61d2173fa36d4409e8e91f52088691d6ba4db13efe19ea7ae7512e64275:busybox/.config
 #@git:3621595939e43a831d66f6b757d4f410029bff95:busybox
 
diff --git a/variants/root-x86_64/busybox:oldbootstrap b/variants/root-x86_64/busybox:oldbootstrap
@@ -1,13 +1,13 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
 #@pragma:nopath
-#+musl-cross-make.5150a4911ed839b84d0c13ec1f279fa0c0593458060b120ed57198c4d7d43fca
-#+gnu-make.660bdddbe6db0afa21a50e6c13cabc7fc14f8ea2dbe29ab2fe0ce8639b085b2d
+#+musl-cross-make.58c5a93650d712a41f2b389dc1f717bf31ffaa06f6d769bf31212ab045c52150
+#+gnu-make.2ff3aad4abc49ad3e4983ee16ba0d31b8776a3b1c8f3d8f0d9ea20171d18130f
 #@git:aa4d303a3139107919f73cece4eaf85a7dc75db6:busybox
 #@sha256:9ee52091d7a41e7e492d508574573fbebe64155d85a07980128f21105eaad1e2:busybox/.config
 
-mcm=/versions/musl-cross-make.5150a4911ed839b84d0c13ec1f279fa0c0593458060b120ed57198c4d7d43fca
-make=/versions/gnu-make.660bdddbe6db0afa21a50e6c13cabc7fc14f8ea2dbe29ab2fe0ce8639b085b2d
+mcm=/versions/musl-cross-make.58c5a93650d712a41f2b389dc1f717bf31ffaa06f6d769bf31212ab045c52150
+make=/versions/gnu-make.2ff3aad4abc49ad3e4983ee16ba0d31b8776a3b1c8f3d8f0d9ea20171d18130f
 
 export PATH="$mcm/bin:$make/command:$PATH"
 export CC="$mcm/bin/x86_64-linux-musl-gcc"
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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+certdata2pem.6ae109a9f8e620358fd088dc5c2cfa32cb277b1adf40431264694ca2b21d5a8f
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+certdata2pem.37bd8b07814574eb33a6dc3b456323a443415cbb694a5da618ffb22a563e769a
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+skalibs.787f60b4d32f3e72df949c0038350cc0d9b245c09a9912a8d1d2bade9f578f73
-#+s6.b466f661193b05290d00f1047805079f131653fa545378c427caf96ba2413129
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+skalibs.fbcd4d1b74a23b27ad4dd4830c82b6b34df76ed3819fd9a523d80daac8bc5988
+#+s6.a052ec72e8699f44f9d85f9130603aaa135e809769002c6cb94c5b7d4e0a224c
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+zsh.491fef7a15462a76f8cb84640d3127c4654aacebd87064bd3e486e81c5b8f397
-#+pthbs-banginstall.d123c717dcdbde6e3fca02bfe008b86639549ef95fa48b303ee0a31b778e6a79
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+zsh.253499e46e90e47c8bf3342e6fe39cabf18532fc150b6da2ce0418aef3287c67
+#+pthbs-banginstall.22166fce84053bfb8337f83bf61b27e7a839dcf642aa08b93ea3575b5b97fc37
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-dosfstools.3ff39c63382b6b03a08e8537f83ed369d79164639a6de6a2b4d1295fdebac6ae
-#+busybox-e2fsprogs.31a5c9c96125f6799ba7866d653ae89f06a87e663f9b31438bc39b79acbed359
-#+busybox-iproute2.072dcebb6cd720f7152743ab12ad17d518dc1e28fd7b7309761da8be4935099f
-#+busybox-iputils.7c10dd88e641b57ca5dfcacc0cbc9210502dff5a6e41fabd672f10a72b132285
-#+busybox-net-misc.54f5b29e415face0c32ad0665d64f13480ac484b2d7886ec49d7f121d53ae125
-#+busybox-net-tools.295483b75ff13c99324fd37b31b59a3e1165ee833f64f806d97543d9b18f7604
-#+busybox-traceroute.6c64ac9fe49fb24f22ef7e18d7c875352cd7827548dba0c744409578feb8a161
-#+busybox-wget.5e1571cf15bb996e12df92c313a1cb07525755889f47c3b946bff1230c319758
-#+busybox-chpst.24e924deb368b54bc6f9fe49299aa8711d9dd4ce5d85feba215154624097401e
-#+busybox-console.2b3cf0502e26d5b9fc80a40ace4e52c76d3859b91be4a2fb45850226e1eb0d45
-#+busybox-getty.d9ebe92822354e261decfccfb25186cbe2377287c23441585c8c9539d6ead732
-#+busybox-i2c-tools.2209c167c4edbc49f643883917d612dd9ca53d67e4e523d576ecf03b21eac1ac
-#+busybox-linux-extra.b2e2d3f8674b4b1cf73d748fd5cc54e98d083439436a522804864dd8b84416a5
-#+busybox-mtd-utils.3e2065e2c74963525536e038a1fc931b16974e098c2d5712b0efc5a6484011b6
-#+busybox-shadow.681f9ffa9dbc7744cb3b16e150296d365df8cefcb40b067742e934e8b4a7eeb1
-#+busybox-su.1d9e70cc1dff427b7df5e1a99ec64a1d59dd1c9b61fba3c5d2d4c1059d6f946b
-#+busybox-util-linux-priv.76728340753177c7161f5146097db31497888855d4f4006937148eff28985418
-#+busybox-logging.b24acbeb998f38d492fa072de773459bfe02f3907337dd62b4349c7dc3668b9c
-#+busybox-cron.128d5e0df464faf29ad16c32ad983361c2c9d242c036cdaa7e0dc0870073e47f
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-login.229859660945a7f73a3bcdf44ba87335336500eb20b0a00c9032e71d37aacc2f
-#+execline.b5cddad4acb4764712c5b11b272a74b1dfeea5ff1b0aa56e2b2e24102e26f8fc
-#+s6.b466f661193b05290d00f1047805079f131653fa545378c427caf96ba2413129
-#+ccx-utils.b6591c55ef25df5fd6c248a30b8fdee5346baa045c0244bfbaea4ada9990a737
-#+applyuidgid-caps.cd57a74587e8f6cd2ecfbe1f8a64089a6ff9aed7b53d2c94f233bff81bac3508
-#+easyseccomp.43e35db0bc03ea6c10cb18a9448590db338e2d20fae11051ecb0449840f7797c
-#+mlog.b8b5890d5b9b37ee62ed3c92b3091a4293ac082d131dc1fdcdb37cdb63d18897
-#+abduco.8e2ad0a8dd3a89b20abf9f11897c8c14b7b0643faffd4f0f218ee2dedefe482b
-#+nawk.3a9c93692a78bb3c37d0ad5e2b0631bb738f46b7865b7b565e27d48b1efb4f2a
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-dosfstools.7fc1a0ab553cc02e7ee18eed4e8315fe490e6dd8bbc5ca2e7837b530d055d3fd
+#+busybox-e2fsprogs.56e3ce469476cd9bc42cde64b731921a18353f354d970b071c4acebcb8478f75
+#+busybox-iproute2.0601716fc4401a2290eb2041743098400253853932da5d34d1f1e31d7d858364
+#+busybox-iputils.3b8da87d82a0f83c0387730d4f98c77688eff37abd170b4be411657fc1680dd1
+#+busybox-net-misc.14697e6f6b73b6905a116326b8ad414a0581c90648ba502a9db94052e916eeaa
+#+busybox-net-tools.494716813146ea60c7b3ff18784483abc202084691262f996ff973add3fa31b1
+#+busybox-traceroute.9e31dd93c49cdaf1b1f790ac9c239416eda161f7d490396e20a8ba9ae5ec2a32
+#+busybox-wget.de65dcd0ec694fef2b2c07bdf6b51d9484b430c530c3e623fd0fff52e74958bd
+#+busybox-chpst.a19eaea5ed12b52edd75d19e0763620cd270e1ceb5fef8e6e9c1765168f2fe7b
+#+busybox-console.79352d3309e1e7dfeb24fbcd8956dc6cf3b9c23e9ece109f6a4cbac919b92591
+#+busybox-getty.1791449c1d99a4ee572a5ddd57ac3fcc3e8c4593804976b9663575cf6871b99d
+#+busybox-i2c-tools.66ae66934a247584026f37de1c429a8be62e358fb317e5ee147c4fceb9af6b9a
+#+busybox-linux-extra.05dec34d509f2a1671476b688698ec4e8e17563eb00d285c3d503ff9f51d1093
+#+busybox-mtd-utils.5826d408718370190016afa013edca8c81034707cde5536be4bbd8426d21567a
+#+busybox-shadow.f5b7cf0f03538138d1f5dbd6694b78297772d7bf32363790f68f2ff0615f8614
+#+busybox-su.652914863fee2139a05a3dfe59f0e205d709b21c6f5ca8ca34a4c8228bdea37d
+#+busybox-util-linux-priv.fd12c7a4ecd3a52322f581a81c18e32538fcf4e9476f62e199c5be6aaa62a364
+#+busybox-logging.fb0dc0a85162f29b38305648d4581c8d92ea25185c5b00bc27617d5510caa258
+#+busybox-cron.1453cfec74ec2315a450ea3bf4ae8f524b5ab76b191a536a2bee4553f527b3c8
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-login.f46792be2e2a9dea3ae513f3c0f22d65eebb85a778348eaccd23cdd4cd71dfdf
+#+execline.f071229a774a18a54adce907ed0762c0bb4cae080e0bc616fd07d69355331e91
+#+s6.a052ec72e8699f44f9d85f9130603aaa135e809769002c6cb94c5b7d4e0a224c
+#+ccx-utils.a9eebb627ba2e78fbe913c7478cc3a2ed4feb69c4f29c400e2912262f11d8371
+#+applyuidgid-caps.3336180df48d6afa771620d9475c4487369015603905e3290c4bb46ecace0867
+#+easyseccomp.22c35ce57286a89a91451d76c78252a04203aa783ab89a836a03cd12ddb4c2d3
+#+mlog.fb71d342cec0bcaf754b302512976b04ed54e66413c7536cf0ade67ee3622d17
+#+abduco.88a8dd79f65124fe0b043864989ed5028a7b9bb451c613287ff6b2dacdfbeb57
+#+nawk.fffd06b71160c3ac0063c67529276c6483b1906cf5823d690569e4225cfdaa06
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+zsh.491fef7a15462a76f8cb84640d3127c4654aacebd87064bd3e486e81c5b8f397
-#+pthbs-banginstall.d123c717dcdbde6e3fca02bfe008b86639549ef95fa48b303ee0a31b778e6a79
-#+execline.b5cddad4acb4764712c5b11b272a74b1dfeea5ff1b0aa56e2b2e24102e26f8fc
-#+alpine-keys.292e4c24072cb7083c38289351557ad898d204fada4e0fb9c51050bc1577d14b
-#+apk-tools.fb7d75da937adec811e132ca2735b174856ab242fafebd2fdd5d3f52f43c0057
-#+xbps.664571ca5dbc5fc04f388c7b15c2d7805e273b801a04661a2cfe7cc8d96009c3
-#+container-bin-image.eb636e3769188a5892b0b9dd8d3ff6c63a142231c30b29cf7b487abbcf4e5d58
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+zsh.253499e46e90e47c8bf3342e6fe39cabf18532fc150b6da2ce0418aef3287c67
+#+pthbs-banginstall.22166fce84053bfb8337f83bf61b27e7a839dcf642aa08b93ea3575b5b97fc37
+#+execline.f071229a774a18a54adce907ed0762c0bb4cae080e0bc616fd07d69355331e91
+#+alpine-keys.c47f125ae62455d9c85bc357c82eef363e2d11118e56873c22c041af3218c813
+#+apk-tools.d32636238c6ed739b4bd3afcdfaef242d1a24633ff8c61d8aa43bb180db1c01a
+#+xbps.427509eccd090be5e27482fcf0ea74c320da5cbfab30b56323664ed25a41f5de
+#+container-bin-image.30c77c663f6dca0d79463ecd09c08cbefe6e2ad6a301cfc84ceab976a7ba49b6
 #@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.fb7d75da937adec811e132ca2735b174856ab242fafebd2fdd5d3f52f43c0057/command/apk.static' "${dest}/deps/command/"
-ln -sf '/versions/xbps.664571ca5dbc5fc04f388c7b15c2d7805e273b801a04661a2cfe7cc8d96009c3/command/xbps-install.static' "${dest}/deps/command/"
+ln -sf '/versions/apk-tools.d32636238c6ed739b4bd3afcdfaef242d1a24633ff8c61d8aa43bb180db1c01a/command/apk.static' "${dest}/deps/command/"
+ln -sf '/versions/xbps.427509eccd090be5e27482fcf0ea74c320da5cbfab30b56323664ed25a41f5de/command/xbps-install.static' "${dest}/deps/command/"
 
-for f in '/versions/alpine-keys.292e4c24072cb7083c38289351557ad898d204fada4e0fb9c51050bc1577d14b'/keys/alpine/*/*; do
+for f in '/versions/alpine-keys.c47f125ae62455d9c85bc357c82eef363e2d11118e56873c22c041af3218c813'/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.292e4c24072cb7083c38289351557ad898d204fada4e0fb9
 done
  
 mkdir -p "${dest}/deps/keys/void"
-for f in '/versions/xbps.664571ca5dbc5fc04f388c7b15c2d7805e273b801a04661a2cfe7cc8d96009c3'/keys/void/*; do
+for f in '/versions/xbps.427509eccd090be5e27482fcf0ea74c320da5cbfab30b56323664ed25a41f5de'/keys/void/*; do
 	ln -sf "$f" "${dest}/deps/keys/void/"
 done
 
-test -d '/versions/container-bin-image.eb636e3769188a5892b0b9dd8d3ff6c63a142231c30b29cf7b487abbcf4e5d58/container-bin-image'
-test -f '/versions/container-bin-image.eb636e3769188a5892b0b9dd8d3ff6c63a142231c30b29cf7b487abbcf4e5d58/container-bin-image/if'
-ln -sf '/versions/container-bin-image.eb636e3769188a5892b0b9dd8d3ff6c63a142231c30b29cf7b487abbcf4e5d58/container-bin-image' "${dest}/deps/"
+test -d '/versions/container-bin-image.30c77c663f6dca0d79463ecd09c08cbefe6e2ad6a301cfc84ceab976a7ba49b6/container-bin-image'
+test -f '/versions/container-bin-image.30c77c663f6dca0d79463ecd09c08cbefe6e2ad6a301cfc84ceab976a7ba49b6/container-bin-image/if'
+ln -sf '/versions/container-bin-image.30c77c663f6dca0d79463ecd09c08cbefe6e2ad6a301cfc84ceab976a7ba49b6/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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-dosfstools.3ff39c63382b6b03a08e8537f83ed369d79164639a6de6a2b4d1295fdebac6ae
-#+busybox-e2fsprogs.31a5c9c96125f6799ba7866d653ae89f06a87e663f9b31438bc39b79acbed359
-#+busybox-iproute2.072dcebb6cd720f7152743ab12ad17d518dc1e28fd7b7309761da8be4935099f
-#+busybox-iputils.7c10dd88e641b57ca5dfcacc0cbc9210502dff5a6e41fabd672f10a72b132285
-#+busybox-net-misc.54f5b29e415face0c32ad0665d64f13480ac484b2d7886ec49d7f121d53ae125
-#+busybox-net-tools.295483b75ff13c99324fd37b31b59a3e1165ee833f64f806d97543d9b18f7604
-#+busybox-traceroute.6c64ac9fe49fb24f22ef7e18d7c875352cd7827548dba0c744409578feb8a161
-#+busybox-wget.5e1571cf15bb996e12df92c313a1cb07525755889f47c3b946bff1230c319758
-#+busybox-chpst.24e924deb368b54bc6f9fe49299aa8711d9dd4ce5d85feba215154624097401e
-#+busybox-console.2b3cf0502e26d5b9fc80a40ace4e52c76d3859b91be4a2fb45850226e1eb0d45
-#+busybox-getty.d9ebe92822354e261decfccfb25186cbe2377287c23441585c8c9539d6ead732
-#+busybox-i2c-tools.2209c167c4edbc49f643883917d612dd9ca53d67e4e523d576ecf03b21eac1ac
-#+busybox-linux-extra.b2e2d3f8674b4b1cf73d748fd5cc54e98d083439436a522804864dd8b84416a5
-#+busybox-mtd-utils.3e2065e2c74963525536e038a1fc931b16974e098c2d5712b0efc5a6484011b6
-#+busybox-shadow.681f9ffa9dbc7744cb3b16e150296d365df8cefcb40b067742e934e8b4a7eeb1
-#+busybox-su.1d9e70cc1dff427b7df5e1a99ec64a1d59dd1c9b61fba3c5d2d4c1059d6f946b
-#+busybox-util-linux-priv.76728340753177c7161f5146097db31497888855d4f4006937148eff28985418
-#+busybox-logging.b24acbeb998f38d492fa072de773459bfe02f3907337dd62b4349c7dc3668b9c
-#+busybox-cron.128d5e0df464faf29ad16c32ad983361c2c9d242c036cdaa7e0dc0870073e47f
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+execline.b5cddad4acb4764712c5b11b272a74b1dfeea5ff1b0aa56e2b2e24102e26f8fc
-#+s6.b466f661193b05290d00f1047805079f131653fa545378c427caf96ba2413129
-#+s6-portable-utils.9b10b212f3dca4bb14bed9ae820e0f0ca3322f774387dc03762bd2f9481a18bd
-#+s6-linux-utils.fe96f77725356d70a42b7d2b9b1aaa75adba6976db8658e154284b029f228355
-#+zsh.491fef7a15462a76f8cb84640d3127c4654aacebd87064bd3e486e81c5b8f397
-#+confz.5fe890aa4a07b60ad1a7f980b540fbfe578f1d8011eca11e1b09ebd42f4a6c7a
-#+containers.9e8530637903c2677026474c605725d781f04c78535fc511ecb5c4404b66cd78
-#+xbps.664571ca5dbc5fc04f388c7b15c2d7805e273b801a04661a2cfe7cc8d96009c3
-#+zstd.c25185f0b25386e2ad693c76b6f644050ed5cc03cd0830a7e11bbb7de560b519
-#+apk-tools.fb7d75da937adec811e132ca2735b174856ab242fafebd2fdd5d3f52f43c0057
-#+alpine-keys.292e4c24072cb7083c38289351557ad898d204fada4e0fb9c51050bc1577d14b
-#+getent.5e10b06164b3a2f32b0696e2c2801f44deb2e917f351bfcfecbb4ed3ef6a8e1f
-#+fileset.b52f41c7eb15fbdc28d66d3559134ac5c2a57a57bfc60ab2b3a05def8cfe55a0
-#+ccx-utils.b6591c55ef25df5fd6c248a30b8fdee5346baa045c0244bfbaea4ada9990a737
-#+easyseccomp.43e35db0bc03ea6c10cb18a9448590db338e2d20fae11051ecb0449840f7797c
-#+findutils.4d6e77521c4951d5a3de1bd7cd77eecb08776141d5c4aa7c6ea524ffbe867e9c
-#+nawk.3a9c93692a78bb3c37d0ad5e2b0631bb738f46b7865b7b565e27d48b1efb4f2a-
\ No newline at end of file
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-dosfstools.7fc1a0ab553cc02e7ee18eed4e8315fe490e6dd8bbc5ca2e7837b530d055d3fd
+#+busybox-e2fsprogs.56e3ce469476cd9bc42cde64b731921a18353f354d970b071c4acebcb8478f75
+#+busybox-iproute2.0601716fc4401a2290eb2041743098400253853932da5d34d1f1e31d7d858364
+#+busybox-iputils.3b8da87d82a0f83c0387730d4f98c77688eff37abd170b4be411657fc1680dd1
+#+busybox-net-misc.14697e6f6b73b6905a116326b8ad414a0581c90648ba502a9db94052e916eeaa
+#+busybox-net-tools.494716813146ea60c7b3ff18784483abc202084691262f996ff973add3fa31b1
+#+busybox-traceroute.9e31dd93c49cdaf1b1f790ac9c239416eda161f7d490396e20a8ba9ae5ec2a32
+#+busybox-wget.de65dcd0ec694fef2b2c07bdf6b51d9484b430c530c3e623fd0fff52e74958bd
+#+busybox-chpst.a19eaea5ed12b52edd75d19e0763620cd270e1ceb5fef8e6e9c1765168f2fe7b
+#+busybox-console.79352d3309e1e7dfeb24fbcd8956dc6cf3b9c23e9ece109f6a4cbac919b92591
+#+busybox-getty.1791449c1d99a4ee572a5ddd57ac3fcc3e8c4593804976b9663575cf6871b99d
+#+busybox-i2c-tools.66ae66934a247584026f37de1c429a8be62e358fb317e5ee147c4fceb9af6b9a
+#+busybox-linux-extra.05dec34d509f2a1671476b688698ec4e8e17563eb00d285c3d503ff9f51d1093
+#+busybox-mtd-utils.5826d408718370190016afa013edca8c81034707cde5536be4bbd8426d21567a
+#+busybox-shadow.f5b7cf0f03538138d1f5dbd6694b78297772d7bf32363790f68f2ff0615f8614
+#+busybox-su.652914863fee2139a05a3dfe59f0e205d709b21c6f5ca8ca34a4c8228bdea37d
+#+busybox-util-linux-priv.fd12c7a4ecd3a52322f581a81c18e32538fcf4e9476f62e199c5be6aaa62a364
+#+busybox-logging.fb0dc0a85162f29b38305648d4581c8d92ea25185c5b00bc27617d5510caa258
+#+busybox-cron.1453cfec74ec2315a450ea3bf4ae8f524b5ab76b191a536a2bee4553f527b3c8
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+execline.f071229a774a18a54adce907ed0762c0bb4cae080e0bc616fd07d69355331e91
+#+s6.a052ec72e8699f44f9d85f9130603aaa135e809769002c6cb94c5b7d4e0a224c
+#+s6-portable-utils.cb4070f9ea15611f849c0a1ade070f2a12050d25933c65af39a58c80accd6b4c
+#+s6-linux-utils.e717644568e8974056f2ca464844675295128271669af74b989b1f1bf70fa7df
+#+zsh.253499e46e90e47c8bf3342e6fe39cabf18532fc150b6da2ce0418aef3287c67
+#+confz.a11466c051e88e0e9b67dcc79997f447ac397743997955b6ffe4f02e791e2531
+#+containers.ce83852822f997559fa49a27398ee874c0383ba4f0011c53aa756b0b3664ed3c
+#+xbps.427509eccd090be5e27482fcf0ea74c320da5cbfab30b56323664ed25a41f5de
+#+zstd.fdf9bf1f2931783deccfbb1ac6eeddd10f0ee96cbbd60bed4a8a2b377bdfa60b
+#+apk-tools.d32636238c6ed739b4bd3afcdfaef242d1a24633ff8c61d8aa43bb180db1c01a
+#+alpine-keys.c47f125ae62455d9c85bc357c82eef363e2d11118e56873c22c041af3218c813
+#+getent.c1c9851495aba4fc78015a48c86f22cc0e4f0548fa464bdb05381cbbe5d32de7
+#+fileset.6857d8af5195a378716bc0351dfe38c9791de0cf3f5c10864c3e7c2e812ed040
+#+ccx-utils.a9eebb627ba2e78fbe913c7478cc3a2ed4feb69c4f29c400e2912262f11d8371
+#+easyseccomp.22c35ce57286a89a91451d76c78252a04203aa783ab89a836a03cd12ddb4c2d3
+#+findutils.7b98184f51dcab852378e9907940903bce7bec9071c87a096f36e27db20ed564
+#+nawk.fffd06b71160c3ac0063c67529276c6483b1906cf5823d690569e4225cfdaa06+
\ 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+m4.6849dbf93ae1e108ae2029f7ced6c362830a26043691660f27adc424742fa16a
-#+libressl.b4bccfabdae12bd61d28f482e64cdc9789cc45698f4aa8a0108b01a667b06034
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+m4.993015f9bbec4bb286bd6ca07fef1e92776574dd009b502a0694e022314804cf
+#+libressl.cfc609041b4eb1c994e2429d12fd2f73dff8ce206109924ff014850f1c4f40e3
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-dosfstools.3ff39c63382b6b03a08e8537f83ed369d79164639a6de6a2b4d1295fdebac6ae
-#+busybox-e2fsprogs.31a5c9c96125f6799ba7866d653ae89f06a87e663f9b31438bc39b79acbed359
-#+busybox-iproute2.072dcebb6cd720f7152743ab12ad17d518dc1e28fd7b7309761da8be4935099f
-#+busybox-iputils.7c10dd88e641b57ca5dfcacc0cbc9210502dff5a6e41fabd672f10a72b132285
-#+busybox-net-misc.54f5b29e415face0c32ad0665d64f13480ac484b2d7886ec49d7f121d53ae125
-#+busybox-net-tools.295483b75ff13c99324fd37b31b59a3e1165ee833f64f806d97543d9b18f7604
-#+busybox-traceroute.6c64ac9fe49fb24f22ef7e18d7c875352cd7827548dba0c744409578feb8a161
-#+busybox-wget.5e1571cf15bb996e12df92c313a1cb07525755889f47c3b946bff1230c319758
-#+busybox-chpst.24e924deb368b54bc6f9fe49299aa8711d9dd4ce5d85feba215154624097401e
-#+busybox-console.2b3cf0502e26d5b9fc80a40ace4e52c76d3859b91be4a2fb45850226e1eb0d45
-#+busybox-getty.d9ebe92822354e261decfccfb25186cbe2377287c23441585c8c9539d6ead732
-#+busybox-i2c-tools.2209c167c4edbc49f643883917d612dd9ca53d67e4e523d576ecf03b21eac1ac
-#+busybox-linux-extra.b2e2d3f8674b4b1cf73d748fd5cc54e98d083439436a522804864dd8b84416a5
-#+busybox-mtd-utils.3e2065e2c74963525536e038a1fc931b16974e098c2d5712b0efc5a6484011b6
-#+busybox-shadow.681f9ffa9dbc7744cb3b16e150296d365df8cefcb40b067742e934e8b4a7eeb1
-#+busybox-su.1d9e70cc1dff427b7df5e1a99ec64a1d59dd1c9b61fba3c5d2d4c1059d6f946b
-#+busybox-util-linux-priv.76728340753177c7161f5146097db31497888855d4f4006937148eff28985418
-#+busybox-logging.b24acbeb998f38d492fa072de773459bfe02f3907337dd62b4349c7dc3668b9c
-#+busybox-cron.128d5e0df464faf29ad16c32ad983361c2c9d242c036cdaa7e0dc0870073e47f
-#+attr.0357fac1aa91a57576599782b8e22d2f0d3247f1db90cb513f6052d47d3c7399
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+diffutils.dfd984d13bd34144fee458d165c7bdc84345c6fd89db7f8359f0c64bd0aab739
-#+patch.b094bff23ba91b83014fa4913272d726f6d454161c0eaf92e3034ff0bf41d4ed
-#+flex.7c2d2d543e2abf524bbdc174157583de0100e00f69dc915a562bcfe14624b0ed
-#+bison.689b0ac7f7a45d41f372049c7d98f890370e9be19479debe4382df77120ba3ff
-#+rsync.192dcf4c758c44a1345543b32ad13510c4edf04a9347f0a23a4ccbfb7af69464
-#+execline.b5cddad4acb4764712c5b11b272a74b1dfeea5ff1b0aa56e2b2e24102e26f8fc
-#+s6.b466f661193b05290d00f1047805079f131653fa545378c427caf96ba2413129
-#+s6-rc.911b7518a2721bc13cba9a597e0e058ed8aa402fe68e8d88b94e62c3c2a59712
-#+s6-portable-utils.9b10b212f3dca4bb14bed9ae820e0f0ca3322f774387dc03762bd2f9481a18bd
-#+s6-linux-utils.fe96f77725356d70a42b7d2b9b1aaa75adba6976db8658e154284b029f228355
-#+s6-linux-init.a60b7996e32b839c5ba1d958a5e68634653ea646c5d930f44b29e92a60f24ffc
-#+mdevd.e603d4269e76fdb6d56104c36bf95b4b0256506029941fc4aa3276d9facb0826
-#+s6-dns.6cdfdfccc07560c084c9a29948d25bdb466bc0e6d3eab64fbf50334533cda59e
-#+libressl.b4bccfabdae12bd61d28f482e64cdc9789cc45698f4aa8a0108b01a667b06034
-#+s6-networking.c3b52fb60ed0cd09be6059b7b61eb24fd313eb6b0652db03a0e9725725642032
-#+zsh.491fef7a15462a76f8cb84640d3127c4654aacebd87064bd3e486e81c5b8f397
-#+pthbs-banginstall.d123c717dcdbde6e3fca02bfe008b86639549ef95fa48b303ee0a31b778e6a79
-#+aat.8037c298bd189ef350247ef00e3d3ad891c96a44c4af57a72b29d6f4ad9bd729
-#+confz.5fe890aa4a07b60ad1a7f980b540fbfe578f1d8011eca11e1b09ebd42f4a6c7a
-#+containers.9e8530637903c2677026474c605725d781f04c78535fc511ecb5c4404b66cd78
-#+fileset.b52f41c7eb15fbdc28d66d3559134ac5c2a57a57bfc60ab2b3a05def8cfe55a0
-#+logincaps.8df05ce6f79a7092d14ee5d4bb55245c726546babad3573827d47538b5b8b30a
-#+snaprep.c560614bbfd4996805dc8e32b33ecdae216acd63baa24de7cfce419480ef2c48
-#+curl.366c50c88ab69a3c9293853d4d640a51c0e70b676857166a96240b305b86a030
-#+git.d9085f2de6363e7c45bd083249b15942421c9b9f9bea077ba4a47b16e3a518a0
-#+xbps.664571ca5dbc5fc04f388c7b15c2d7805e273b801a04661a2cfe7cc8d96009c3
-#+apk-tools.fb7d75da937adec811e132ca2735b174856ab242fafebd2fdd5d3f52f43c0057
-#+getent.5e10b06164b3a2f32b0696e2c2801f44deb2e917f351bfcfecbb4ed3ef6a8e1f
-#+getconf.0968844b268686a1c17deef82461673aabaecc51795827bec19e2562fa288112
-#+iconv.44d8c72aaff73edbd6d7ebcc6a170cc0c3d5555150e6c36483d8d026171a0b1a
-#+libcap.746b05f72aa151abe54c9d50f8746b3d575c22b3206b4b2f665ae8ac42f01b56
-#+applyuidgid-caps.cd57a74587e8f6cd2ecfbe1f8a64089a6ff9aed7b53d2c94f233bff81bac3508
-#+ccx-utils.b6591c55ef25df5fd6c248a30b8fdee5346baa045c0244bfbaea4ada9990a737
-#+user-env.28d416dc379497ec1b10372f04214e5e96435b1c1e8bd5e0d93d8b7b2de1d25b
-#+strace.3e3cbc174d3fc26f9aca14555bcba4ac0734ef90c13439dd9bf8ea8e2d7247c3
-#+mlog.b8b5890d5b9b37ee62ed3c92b3091a4293ac082d131dc1fdcdb37cdb63d18897
-#+findutils.4d6e77521c4951d5a3de1bd7cd77eecb08776141d5c4aa7c6ea524ffbe867e9c
-#+nawk.3a9c93692a78bb3c37d0ad5e2b0631bb738f46b7865b7b565e27d48b1efb4f2a
-#+nvi.15e767e8b7dda8aef4bb0ef32f52fbd81f57a3534de16b005f91afbb4cf71b99
-#+squashfs-tools.e33b0399fcdc8323f1035c036381653edd484e11451450f42cd8d71f1668b5b9
-#+mandoc.542c2519f60c6f49b41ebec560d13202719a1e58df2905757f9a88b9e0f69781
-#+tinyssh.8f3d65a4390e9a661e7783f6423a43d1b4b6239b7e7f28f6362b91da6dab0d9d
-#+system-config.affaf469483c2dc9819d70bc0507073bb27c03943fdf2471529cb39cd36fe0a5
-#+system-config-rc.def887e8659c83e41c03f9303b77ba24772084f54f1b4fbbbf9c053ad4f8e02e
-#+system-config-scripts.29bd497a538ca1ae3e71cd4e0443d579b69fe8d8ab37bfd2cbde00c6685b2778
-#+system-config-init.5eac8b8d05f9c8986f8a672b79cb9e09968242626f4d46621858b0c3f4179098
-#+system-config-zsh.e2aa861bd2c10331ec548c4124479929b3fde2e21bc4dcb245a7e78d89352097
-#+busybox-modutils.e5d03d2b260914125875697fe02518c1b4e527b2bb48b3d2e45a4263b4088208-
\ No newline at end of file
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-dosfstools.7fc1a0ab553cc02e7ee18eed4e8315fe490e6dd8bbc5ca2e7837b530d055d3fd
+#+busybox-e2fsprogs.56e3ce469476cd9bc42cde64b731921a18353f354d970b071c4acebcb8478f75
+#+busybox-iproute2.0601716fc4401a2290eb2041743098400253853932da5d34d1f1e31d7d858364
+#+busybox-iputils.3b8da87d82a0f83c0387730d4f98c77688eff37abd170b4be411657fc1680dd1
+#+busybox-net-misc.14697e6f6b73b6905a116326b8ad414a0581c90648ba502a9db94052e916eeaa
+#+busybox-net-tools.494716813146ea60c7b3ff18784483abc202084691262f996ff973add3fa31b1
+#+busybox-traceroute.9e31dd93c49cdaf1b1f790ac9c239416eda161f7d490396e20a8ba9ae5ec2a32
+#+busybox-wget.de65dcd0ec694fef2b2c07bdf6b51d9484b430c530c3e623fd0fff52e74958bd
+#+busybox-chpst.a19eaea5ed12b52edd75d19e0763620cd270e1ceb5fef8e6e9c1765168f2fe7b
+#+busybox-console.79352d3309e1e7dfeb24fbcd8956dc6cf3b9c23e9ece109f6a4cbac919b92591
+#+busybox-getty.1791449c1d99a4ee572a5ddd57ac3fcc3e8c4593804976b9663575cf6871b99d
+#+busybox-i2c-tools.66ae66934a247584026f37de1c429a8be62e358fb317e5ee147c4fceb9af6b9a
+#+busybox-linux-extra.05dec34d509f2a1671476b688698ec4e8e17563eb00d285c3d503ff9f51d1093
+#+busybox-mtd-utils.5826d408718370190016afa013edca8c81034707cde5536be4bbd8426d21567a
+#+busybox-shadow.f5b7cf0f03538138d1f5dbd6694b78297772d7bf32363790f68f2ff0615f8614
+#+busybox-su.652914863fee2139a05a3dfe59f0e205d709b21c6f5ca8ca34a4c8228bdea37d
+#+busybox-util-linux-priv.fd12c7a4ecd3a52322f581a81c18e32538fcf4e9476f62e199c5be6aaa62a364
+#+busybox-logging.fb0dc0a85162f29b38305648d4581c8d92ea25185c5b00bc27617d5510caa258
+#+busybox-cron.1453cfec74ec2315a450ea3bf4ae8f524b5ab76b191a536a2bee4553f527b3c8
+#+attr.9ffe382c581a8af0378ee487d80218a4b7bf4568b7766779df2779dfb8f13486
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+diffutils.d2f4ec34328287b5d8663726c2a48e2868a5189cbf25b6513b7405e5d3b8838f
+#+patch.8e0c7cb577376dc28779fc98e3fca226002f90fbd8f71a592926d4f92023afab
+#+flex.6cd3baf9c0d9c22fca00e961aef92d0f435cc95be91ddd284a9b670549b4ad38
+#+bison.27c5b7956c7426266ddcc95f419638546fac55e2271d2f5f10a0bde2a90803ee
+#+rsync.e5d4421bddb123de8f26c62ef3f7b4e422db2d44ef09c9244cc4832aab83cead
+#+execline.f071229a774a18a54adce907ed0762c0bb4cae080e0bc616fd07d69355331e91
+#+s6.a052ec72e8699f44f9d85f9130603aaa135e809769002c6cb94c5b7d4e0a224c
+#+s6-rc.53203c1ccf39b1851bfdb0ab5cb2d0ae97424549d87979912b1f576bd37aaca4
+#+s6-portable-utils.cb4070f9ea15611f849c0a1ade070f2a12050d25933c65af39a58c80accd6b4c
+#+s6-linux-utils.e717644568e8974056f2ca464844675295128271669af74b989b1f1bf70fa7df
+#+s6-linux-init.baf4fde29e0cd55060eff75e1534e6c2051ada04a8894bba141e6d02f410ec9f
+#+mdevd.1725680ab36d5a98d9011bd4e0f438544c8d0a473b79b4c37f8bb582a1c082ba
+#+s6-dns.ae463f4376e39aa473759b65643e39340158941ed7e485993f8b5f2515db816b
+#+libressl.cfc609041b4eb1c994e2429d12fd2f73dff8ce206109924ff014850f1c4f40e3
+#+s6-networking.a9458d1240160094822940e4b105191cef43973bcf43628c618e7d1a75749f6a
+#+zsh.253499e46e90e47c8bf3342e6fe39cabf18532fc150b6da2ce0418aef3287c67
+#+pthbs-banginstall.22166fce84053bfb8337f83bf61b27e7a839dcf642aa08b93ea3575b5b97fc37
+#+aat.7312065d71e0070ab3e882c83b3dba48a9a24acd17d614a9b2ba6dff44ea0443
+#+confz.a11466c051e88e0e9b67dcc79997f447ac397743997955b6ffe4f02e791e2531
+#+containers.ce83852822f997559fa49a27398ee874c0383ba4f0011c53aa756b0b3664ed3c
+#+fileset.6857d8af5195a378716bc0351dfe38c9791de0cf3f5c10864c3e7c2e812ed040
+#+logincaps.5dbf75f35938f9032e273d5f2a0c90bd4a87f8e970de3fe6e61425f74a78941e
+#+snaprep.19b7bfc3dfbdea292d8513bbb499acf983889185c6f0b8822e8395592abe870a
+#+curl.f21147559df42812a077e63a0d7ee3bf6690843161772c713e627b888b6891dc
+#+git.307f7fca123437b9ef3eb94bff93d36e5600479360c78875d752902db8df0aff
+#+xbps.427509eccd090be5e27482fcf0ea74c320da5cbfab30b56323664ed25a41f5de
+#+apk-tools.d32636238c6ed739b4bd3afcdfaef242d1a24633ff8c61d8aa43bb180db1c01a
+#+getent.c1c9851495aba4fc78015a48c86f22cc0e4f0548fa464bdb05381cbbe5d32de7
+#+getconf.2ed3e178cc3f676e38c4d9424e3a351490a50c954fbc573f31752ab97a2d1b64
+#+iconv.7f2d71e74197e9d0500528adefae332fbec1f9c63393b4061557413d984c2ee1
+#+libcap.816074859b54c507a8120c3a4a870e10fd80ea89831f2b01dbcc596ddc542c61
+#+applyuidgid-caps.3336180df48d6afa771620d9475c4487369015603905e3290c4bb46ecace0867
+#+ccx-utils.a9eebb627ba2e78fbe913c7478cc3a2ed4feb69c4f29c400e2912262f11d8371
+#+user-env.c6ea0b61a6428362fd8bab26f37e4fbc3c179e13897575306f35557e1bb12c91
+#+strace.470a59dcfb504a4fb4ff7416c5058f602cf898fb0644745df61757993ed5e522
+#+mlog.fb71d342cec0bcaf754b302512976b04ed54e66413c7536cf0ade67ee3622d17
+#+findutils.7b98184f51dcab852378e9907940903bce7bec9071c87a096f36e27db20ed564
+#+nawk.fffd06b71160c3ac0063c67529276c6483b1906cf5823d690569e4225cfdaa06
+#+nvi.d1c76613348533bfeca98c349ebef5bbc224145379fd24fab429d3560a7f1845
+#+squashfs-tools.10496143dc037f2faabb460d8e37c62350ab33487eccbc27bbace7f4444dd5f8
+#+mandoc.9ff21e8446bf3e4d9fcebc1c7676b3e06b7226137663ad88e15e5c22f5f02d20
+#+tinyssh.a6ebad48b9ccec0499a11395cf302fb797d01f471b8b35ebbbaabe82abb1fe21
+#+system-config.ca7b0e5293fcdd04cb72756333c079204f9153929afc0ef5003fc08a22778654
+#+system-config-rc.c9c25399f3f55c33f803116e407a0c3efe752973cf5c0ca1da29317925c3215a
+#+system-config-scripts.6dad043d03e2dad3b55934efc34d8f23966d26196466f3aefdb980ad001e48a7
+#+system-config-init.1068ab0b8f15fa4b54e5fa9ee17c5533e76edcfc8204af43bc7af47bad1c457b
+#+system-config-zsh.fa2b55be738d779df038853115c226ca9c0ae47abb908e74e7e6b043877cfa27
+#+busybox-modutils.3788285ad89fc6ffafdd57cd4e9506d19e53263b740837d6230d893e52d19838+
\ 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+m4.6849dbf93ae1e108ae2029f7ced6c362830a26043691660f27adc424742fa16a
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+m4.993015f9bbec4bb286bd6ca07fef1e92776574dd009b502a0694e022314804cf
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.d6e4d0c8f32051b43336331e40b9a39283ad64548b83ecf0505270a37a0300af
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+ocaml.639fb2aa6a03312b53679276a66821e7a85fa3f16cd56c2471532fb265089043
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+m4.6849dbf93ae1e108ae2029f7ced6c362830a26043691660f27adc424742fa16a
-#+patch.b094bff23ba91b83014fa4913272d726f6d454161c0eaf92e3034ff0bf41d4ed
-#+flex.7c2d2d543e2abf524bbdc174157583de0100e00f69dc915a562bcfe14624b0ed
-#+bison.689b0ac7f7a45d41f372049c7d98f890370e9be19479debe4382df77120ba3ff
-#+libseccomp.3e24a4528df3771e2ec47c268283a58390f5668aa2bf734489f9d29e7a046bec
-#+error-standalone.72c56a4eb051eff3823426a70a59f91d96f9769c25f87c45e48e5479fc2e5213
-#+argp-standalone.c5b9bea1b9cad0a5a0a761f427ab1b603e9e4239a111066923c39b1d39e512ac
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+m4.993015f9bbec4bb286bd6ca07fef1e92776574dd009b502a0694e022314804cf
+#+patch.8e0c7cb577376dc28779fc98e3fca226002f90fbd8f71a592926d4f92023afab
+#+flex.6cd3baf9c0d9c22fca00e961aef92d0f435cc95be91ddd284a9b670549b4ad38
+#+bison.27c5b7956c7426266ddcc95f419638546fac55e2271d2f5f10a0bde2a90803ee
+#+libseccomp.6881113eecdc54eee81813a5946bb881ac88578996b4b2d47794508c03a03b77
+#+error-standalone.a5bd049592003ec89865050cb38666a6e096d7dbf75b3f6ed33d616c47d9a932
+#+argp-standalone.d24bafa929347e21f05abc8bb4f85725904b9aaea87d0d06c14023080f4ce04e
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+skalibs.787f60b4d32f3e72df949c0038350cc0d9b245c09a9912a8d1d2bade9f578f73
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+skalibs.fbcd4d1b74a23b27ad4dd4830c82b6b34df76ed3819fd9a523d80daac8bc5988
 #@git:6c0957eb5e8eea2ffada4d7be08286f0e81d0527:execline
 
 
@@ -48,7 +46,7 @@ cd 'execline'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.787f60b4d32f3e72df949c0038350cc0d9b245c09a9912a8d1d2bade9f578f73/sysdeps' \
+	--with-sysdeps='/versions/skalibs.fbcd4d1b74a23b27ad4dd4830c82b6b34df76ed3819fd9a523d80daac8bc5988/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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+zsh.491fef7a15462a76f8cb84640d3127c4654aacebd87064bd3e486e81c5b8f397
-#+pthbs-banginstall.d123c717dcdbde6e3fca02bfe008b86639549ef95fa48b303ee0a31b778e6a79
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+zsh.253499e46e90e47c8bf3342e6fe39cabf18532fc150b6da2ce0418aef3287c67
+#+pthbs-banginstall.22166fce84053bfb8337f83bf61b27e7a839dcf642aa08b93ea3575b5b97fc37
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+m4.6849dbf93ae1e108ae2029f7ced6c362830a26043691660f27adc424742fa16a
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+m4.993015f9bbec4bb286bd6ca07fef1e92776574dd009b502a0694e022314804cf
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+m4.6849dbf93ae1e108ae2029f7ced6c362830a26043691660f27adc424742fa16a
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+m4.993015f9bbec4bb286bd6ca07fef1e92776574dd009b502a0694e022314804cf
 #@untar:-z:sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995:.
 
 
diff --git a/variants/root-x86_64/getconf b/variants/root-x86_64/getconf
@@ -1,35 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+m4.6849dbf93ae1e108ae2029f7ced6c362830a26043691660f27adc424742fa16a
-#+libressl.b4bccfabdae12bd61d28f482e64cdc9789cc45698f4aa8a0108b01a667b06034
-#+curl.366c50c88ab69a3c9293853d4d640a51c0e70b676857166a96240b305b86a030
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+m4.993015f9bbec4bb286bd6ca07fef1e92776574dd009b502a0694e022314804cf
+#+libressl.cfc609041b4eb1c994e2429d12fd2f73dff8ce206109924ff014850f1c4f40e3
+#+curl.f21147559df42812a077e63a0d7ee3bf6690843161772c713e627b888b6891dc
 #@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.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
 #+gnu-make.e4a639067dbdc87f724a0af3861ce3ec1fc8d2ad5046d28f7e687b5ac6e9cc7e
 #+busybox.70e10331182e87f76ae1821e68138f35729ca894da9b2e2ac5ec548a99c7312d
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
diff --git a/variants/root-x86_64/gnu-make:old b/variants/root-x86_64/gnu-make:old
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.521ed668f18e5a89c45bcb2cd229f293cbdcae8b2e3650002cfa0c37ada9009e
-#+gnu-make.660bdddbe6db0afa21a50e6c13cabc7fc14f8ea2dbe29ab2fe0ce8639b085b2d
-#+busybox.8b6145faa03d2459be5dcb6fe35da12c53ceec094ac0b689fb6cf7212c227497
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.2ff3aad4abc49ad3e4983ee16ba0d31b8776a3b1c8f3d8f0d9ea20171d18130f
+#+busybox.894b0a70452d0be23fe59c0c800bb70ab40bf642db18fea7e354ad5a42052b8e
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 
diff --git a/variants/root-x86_64/gnu-make:oldbootstrap b/variants/root-x86_64/gnu-make:oldbootstrap
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
 #@pragma:nopath
-#+musl-cross-make.5150a4911ed839b84d0c13ec1f279fa0c0593458060b120ed57198c4d7d43fca
+#+musl-cross-make.58c5a93650d712a41f2b389dc1f717bf31ffaa06f6d769bf31212ab045c52150
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 
@@ -36,7 +36,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd 'make-4.4.1'
 
 
-mcm=/versions/musl-cross-make.5150a4911ed839b84d0c13ec1f279fa0c0593458060b120ed57198c4d7d43fca
+mcm=/versions/musl-cross-make.58c5a93650d712a41f2b389dc1f717bf31ffaa06f6d769bf31212ab045c52150
 
 export PATH="$mcm/bin:$PATH"
 export CC="$mcm/bin/x86_64-linux-musl-gcc"
diff --git a/variants/root-x86_64/gperf b/variants/root-x86_64/gperf
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+m4.6849dbf93ae1e108ae2029f7ced6c362830a26043691660f27adc424742fa16a
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+m4.993015f9bbec4bb286bd6ca07fef1e92776574dd009b502a0694e022314804cf
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+m4.6849dbf93ae1e108ae2029f7ced6c362830a26043691660f27adc424742fa16a
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+m4.993015f9bbec4bb286bd6ca07fef1e92776574dd009b502a0694e022314804cf
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+m4.6849dbf93ae1e108ae2029f7ced6c362830a26043691660f27adc424742fa16a
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+m4.993015f9bbec4bb286bd6ca07fef1e92776574dd009b502a0694e022314804cf
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+m4.6849dbf93ae1e108ae2029f7ced6c362830a26043691660f27adc424742fa16a
-#+libmd.fac559e5947e5f11b15a0e6d04aeb1b6f10fe0033228dabe6e93e0a3cdeae1fb
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+m4.993015f9bbec4bb286bd6ca07fef1e92776574dd009b502a0694e022314804cf
+#+libmd.cf3d4bdb0ae80f57daceebdfb9006d3f55a5ecb3965625ba1489e7727cac92d2
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+pkgconf-pkg-config.d629fe0658f1e8f1ab46f13600c9a6801bea74c41fa457e2cb69b00f98f13c8b
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+pkgconf-pkg-config.660b67bb60a770fe6a8b683681d667691eb85f0c8f5690b9fc813daefb723bfb
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+m4.6849dbf93ae1e108ae2029f7ced6c362830a26043691660f27adc424742fa16a
-#+flex.7c2d2d543e2abf524bbdc174157583de0100e00f69dc915a562bcfe14624b0ed
-#+bison.689b0ac7f7a45d41f372049c7d98f890370e9be19479debe4382df77120ba3ff
-#+musl-fts.d7e63dad3ced517bee344ab9eb8dc09f70dbeae56843273711bbfea24dc63cc7
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+m4.993015f9bbec4bb286bd6ca07fef1e92776574dd009b502a0694e022314804cf
+#+flex.6cd3baf9c0d9c22fca00e961aef92d0f435cc95be91ddd284a9b670549b4ad38
+#+bison.27c5b7956c7426266ddcc95f419638546fac55e2271d2f5f10a0bde2a90803ee
+#+musl-fts.e9591ae359b70874c307a13d1b3248dae01783f7ffd8045f595140fd529be301
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+zstd.c25185f0b25386e2ad693c76b6f644050ed5cc03cd0830a7e11bbb7de560b519
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+zstd.fdf9bf1f2931783deccfbb1ac6eeddd10f0ee96cbbd60bed4a8a2b377bdfa60b
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+m4.6849dbf93ae1e108ae2029f7ced6c362830a26043691660f27adc424742fa16a
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+m4.993015f9bbec4bb286bd6ca07fef1e92776574dd009b502a0694e022314804cf
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+m4.6849dbf93ae1e108ae2029f7ced6c362830a26043691660f27adc424742fa16a
-#+ca-certificates-wip-donotuse.85f1af0b073ea8a4a48b9c45382c8baa2593134ce400cd5a375f25827d013efb
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+m4.993015f9bbec4bb286bd6ca07fef1e92776574dd009b502a0694e022314804cf
+#+ca-certificates-wip-donotuse.7894acf0922afeb07a26adf7259d07f72d4ca98ce4e16a8e6ea61cb0dfab2e11
 #@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.85f1af0b073ea8a4a48b9c45382c8baa2593134ce400cd5a375f25827d013efb/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/"
+cp -vs '/versions/ca-certificates-wip-donotuse.7894acf0922afeb07a26adf7259d07f72d4ca98ce4e16a8e6ea61cb0dfab2e11/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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+m4.6849dbf93ae1e108ae2029f7ced6c362830a26043691660f27adc424742fa16a
-#+pkgconf-pkg-config.d629fe0658f1e8f1ab46f13600c9a6801bea74c41fa457e2cb69b00f98f13c8b
-#+gperf.2a9e63eeac8bdba29d73feffdb85a6383c24956c433d1dc43dce295bb9ec593b
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+m4.993015f9bbec4bb286bd6ca07fef1e92776574dd009b502a0694e022314804cf
+#+pkgconf-pkg-config.660b67bb60a770fe6a8b683681d667691eb85f0c8f5690b9fc813daefb723bfb
+#+gperf.ca134926202480a36fbe66426b4e09fa5b6e32aafa4cc8e6e035fc5fe2ce9592
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+m4.6849dbf93ae1e108ae2029f7ced6c362830a26043691660f27adc424742fa16a
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+m4.993015f9bbec4bb286bd6ca07fef1e92776574dd009b502a0694e022314804cf
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-modutils.e5d03d2b260914125875697fe02518c1b4e527b2bb48b3d2e45a4263b4088208
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+findutils.4d6e77521c4951d5a3de1bd7cd77eecb08776141d5c4aa7c6ea524ffbe867e9c
-#+diffutils.dfd984d13bd34144fee458d165c7bdc84345c6fd89db7f8359f0c64bd0aab739
-#+patch.b094bff23ba91b83014fa4913272d726f6d454161c0eaf92e3034ff0bf41d4ed
-#+flex.7c2d2d543e2abf524bbdc174157583de0100e00f69dc915a562bcfe14624b0ed
-#+bison.689b0ac7f7a45d41f372049c7d98f890370e9be19479debe4382df77120ba3ff
-#+rsync.192dcf4c758c44a1345543b32ad13510c4edf04a9347f0a23a4ccbfb7af69464
-#+zstd.c25185f0b25386e2ad693c76b6f644050ed5cc03cd0830a7e11bbb7de560b519
-#+libelf.a6b09c8e8996c160d273a011c49d7420f98c15744673bbe3b3803713abb2b20f
-#+pkgconf-pkg-config.d629fe0658f1e8f1ab46f13600c9a6801bea74c41fa457e2cb69b00f98f13c8b
-#+nawk.3a9c93692a78bb3c37d0ad5e2b0631bb738f46b7865b7b565e27d48b1efb4f2a
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-modutils.3788285ad89fc6ffafdd57cd4e9506d19e53263b740837d6230d893e52d19838
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+findutils.7b98184f51dcab852378e9907940903bce7bec9071c87a096f36e27db20ed564
+#+diffutils.d2f4ec34328287b5d8663726c2a48e2868a5189cbf25b6513b7405e5d3b8838f
+#+patch.8e0c7cb577376dc28779fc98e3fca226002f90fbd8f71a592926d4f92023afab
+#+flex.6cd3baf9c0d9c22fca00e961aef92d0f435cc95be91ddd284a9b670549b4ad38
+#+bison.27c5b7956c7426266ddcc95f419638546fac55e2271d2f5f10a0bde2a90803ee
+#+rsync.e5d4421bddb123de8f26c62ef3f7b4e422db2d44ef09c9244cc4832aab83cead
+#+zstd.fdf9bf1f2931783deccfbb1ac6eeddd10f0ee96cbbd60bed4a8a2b377bdfa60b
+#+libelf.e46807ce2406eb22c79f07b776b63fc7bcb723716796ad18e2a9c5d83dd381c5
+#+pkgconf-pkg-config.660b67bb60a770fe6a8b683681d667691eb85f0c8f5690b9fc813daefb723bfb
+#+nawk.fffd06b71160c3ac0063c67529276c6483b1906cf5823d690569e4225cfdaa06
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+zsh.491fef7a15462a76f8cb84640d3127c4654aacebd87064bd3e486e81c5b8f397
-#+pthbs-banginstall.d123c717dcdbde6e3fca02bfe008b86639549ef95fa48b303ee0a31b778e6a79
-#+execline.b5cddad4acb4764712c5b11b272a74b1dfeea5ff1b0aa56e2b2e24102e26f8fc
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ccx-utils.b6591c55ef25df5fd6c248a30b8fdee5346baa045c0244bfbaea4ada9990a737
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+zsh.253499e46e90e47c8bf3342e6fe39cabf18532fc150b6da2ce0418aef3287c67
+#+pthbs-banginstall.22166fce84053bfb8337f83bf61b27e7a839dcf642aa08b93ea3575b5b97fc37
+#+execline.f071229a774a18a54adce907ed0762c0bb4cae080e0bc616fd07d69355331e91
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+ccx-utils.a9eebb627ba2e78fbe913c7478cc3a2ed4feb69c4f29c400e2912262f11d8371
 #@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.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+busybox.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+zsh.491fef7a15462a76f8cb84640d3127c4654aacebd87064bd3e486e81c5b8f397
-#+pthbs-banginstall.d123c717dcdbde6e3fca02bfe008b86639549ef95fa48b303ee0a31b778e6a79
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+zsh.253499e46e90e47c8bf3342e6fe39cabf18532fc150b6da2ce0418aef3287c67
+#+pthbs-banginstall.22166fce84053bfb8337f83bf61b27e7a839dcf642aa08b93ea3575b5b97fc37
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+skalibs.787f60b4d32f3e72df949c0038350cc0d9b245c09a9912a8d1d2bade9f578f73
-#+execline.b5cddad4acb4764712c5b11b272a74b1dfeea5ff1b0aa56e2b2e24102e26f8fc
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+skalibs.fbcd4d1b74a23b27ad4dd4830c82b6b34df76ed3819fd9a523d80daac8bc5988
+#+execline.f071229a774a18a54adce907ed0762c0bb4cae080e0bc616fd07d69355331e91
 #@git:96aef400b9f9d14f3bf54b0e444e9ad3665c4107:mdevd
 
 
@@ -49,7 +47,7 @@ cd 'mdevd'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.787f60b4d32f3e72df949c0038350cc0d9b245c09a9912a8d1d2bade9f578f73/sysdeps' \
+	--with-sysdeps='/versions/skalibs.fbcd4d1b74a23b27ad4dd4830c82b6b34df76ed3819fd9a523d80daac8bc5988/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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-dosfstools.3ff39c63382b6b03a08e8537f83ed369d79164639a6de6a2b4d1295fdebac6ae
-#+busybox-e2fsprogs.31a5c9c96125f6799ba7866d653ae89f06a87e663f9b31438bc39b79acbed359
-#+busybox-iproute2.072dcebb6cd720f7152743ab12ad17d518dc1e28fd7b7309761da8be4935099f
-#+busybox-iputils.7c10dd88e641b57ca5dfcacc0cbc9210502dff5a6e41fabd672f10a72b132285
-#+busybox-net-misc.54f5b29e415face0c32ad0665d64f13480ac484b2d7886ec49d7f121d53ae125
-#+busybox-net-tools.295483b75ff13c99324fd37b31b59a3e1165ee833f64f806d97543d9b18f7604
-#+busybox-traceroute.6c64ac9fe49fb24f22ef7e18d7c875352cd7827548dba0c744409578feb8a161
-#+busybox-wget.5e1571cf15bb996e12df92c313a1cb07525755889f47c3b946bff1230c319758
-#+busybox-chpst.24e924deb368b54bc6f9fe49299aa8711d9dd4ce5d85feba215154624097401e
-#+busybox-console.2b3cf0502e26d5b9fc80a40ace4e52c76d3859b91be4a2fb45850226e1eb0d45
-#+busybox-getty.d9ebe92822354e261decfccfb25186cbe2377287c23441585c8c9539d6ead732
-#+busybox-i2c-tools.2209c167c4edbc49f643883917d612dd9ca53d67e4e523d576ecf03b21eac1ac
-#+busybox-linux-extra.b2e2d3f8674b4b1cf73d748fd5cc54e98d083439436a522804864dd8b84416a5
-#+busybox-mtd-utils.3e2065e2c74963525536e038a1fc931b16974e098c2d5712b0efc5a6484011b6
-#+busybox-shadow.681f9ffa9dbc7744cb3b16e150296d365df8cefcb40b067742e934e8b4a7eeb1
-#+busybox-su.1d9e70cc1dff427b7df5e1a99ec64a1d59dd1c9b61fba3c5d2d4c1059d6f946b
-#+busybox-util-linux-priv.76728340753177c7161f5146097db31497888855d4f4006937148eff28985418
-#+busybox-logging.b24acbeb998f38d492fa072de773459bfe02f3907337dd62b4349c7dc3668b9c
-#+busybox-cron.128d5e0df464faf29ad16c32ad983361c2c9d242c036cdaa7e0dc0870073e47f
-#+execline.b5cddad4acb4764712c5b11b272a74b1dfeea5ff1b0aa56e2b2e24102e26f8fc
-#+s6.b466f661193b05290d00f1047805079f131653fa545378c427caf96ba2413129
-#+mdev-scripts.bce131146d5bc639ac85134ab6736a14a7d88903c6f65cd5674e69366b4e0704
-#+mdevd.e603d4269e76fdb6d56104c36bf95b4b0256506029941fc4aa3276d9facb0826
-#+busybox-modutils.e5d03d2b260914125875697fe02518c1b4e527b2bb48b3d2e45a4263b4088208-
\ No newline at end of file
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-dosfstools.7fc1a0ab553cc02e7ee18eed4e8315fe490e6dd8bbc5ca2e7837b530d055d3fd
+#+busybox-e2fsprogs.56e3ce469476cd9bc42cde64b731921a18353f354d970b071c4acebcb8478f75
+#+busybox-iproute2.0601716fc4401a2290eb2041743098400253853932da5d34d1f1e31d7d858364
+#+busybox-iputils.3b8da87d82a0f83c0387730d4f98c77688eff37abd170b4be411657fc1680dd1
+#+busybox-net-misc.14697e6f6b73b6905a116326b8ad414a0581c90648ba502a9db94052e916eeaa
+#+busybox-net-tools.494716813146ea60c7b3ff18784483abc202084691262f996ff973add3fa31b1
+#+busybox-traceroute.9e31dd93c49cdaf1b1f790ac9c239416eda161f7d490396e20a8ba9ae5ec2a32
+#+busybox-wget.de65dcd0ec694fef2b2c07bdf6b51d9484b430c530c3e623fd0fff52e74958bd
+#+busybox-chpst.a19eaea5ed12b52edd75d19e0763620cd270e1ceb5fef8e6e9c1765168f2fe7b
+#+busybox-console.79352d3309e1e7dfeb24fbcd8956dc6cf3b9c23e9ece109f6a4cbac919b92591
+#+busybox-getty.1791449c1d99a4ee572a5ddd57ac3fcc3e8c4593804976b9663575cf6871b99d
+#+busybox-i2c-tools.66ae66934a247584026f37de1c429a8be62e358fb317e5ee147c4fceb9af6b9a
+#+busybox-linux-extra.05dec34d509f2a1671476b688698ec4e8e17563eb00d285c3d503ff9f51d1093
+#+busybox-mtd-utils.5826d408718370190016afa013edca8c81034707cde5536be4bbd8426d21567a
+#+busybox-shadow.f5b7cf0f03538138d1f5dbd6694b78297772d7bf32363790f68f2ff0615f8614
+#+busybox-su.652914863fee2139a05a3dfe59f0e205d709b21c6f5ca8ca34a4c8228bdea37d
+#+busybox-util-linux-priv.fd12c7a4ecd3a52322f581a81c18e32538fcf4e9476f62e199c5be6aaa62a364
+#+busybox-logging.fb0dc0a85162f29b38305648d4581c8d92ea25185c5b00bc27617d5510caa258
+#+busybox-cron.1453cfec74ec2315a450ea3bf4ae8f524b5ab76b191a536a2bee4553f527b3c8
+#+execline.f071229a774a18a54adce907ed0762c0bb4cae080e0bc616fd07d69355331e91
+#+s6.a052ec72e8699f44f9d85f9130603aaa135e809769002c6cb94c5b7d4e0a224c
+#+mdev-scripts.1f132e1389d7c2548a9fc49b07420d3a65c6cd5231706c860ad3cb7811ced252
+#+mdevd.1725680ab36d5a98d9011bd4e0f438544c8d0a473b79b4c37f8bb582a1c082ba
+#+busybox-modutils.3788285ad89fc6ffafdd57cd4e9506d19e53263b740837d6230d893e52d19838+
\ 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
 #@git:fefc95731f1260810a3551226b73d35f3d6e9d9e:mlog
 
 
diff --git a/variants/root-x86_64/musl-cross-make:old b/variants/root-x86_64/musl-cross-make:old
@@ -1,8 +1,8 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nofail_digest
-#+musl-cross-make.5150a4911ed839b84d0c13ec1f279fa0c0593458060b120ed57198c4d7d43fca
-#+gnu-make.660bdddbe6db0afa21a50e6c13cabc7fc14f8ea2dbe29ab2fe0ce8639b085b2d
-#+busybox.8b6145faa03d2459be5dcb6fe35da12c53ceec094ac0b689fb6cf7212c227497
+#+musl-cross-make.58c5a93650d712a41f2b389dc1f717bf31ffaa06f6d769bf31212ab045c52150
+#+gnu-make.2ff3aad4abc49ad3e4983ee16ba0d31b8776a3b1c8f3d8f0d9ea20171d18130f
+#+busybox.894b0a70452d0be23fe59c0c800bb70ab40bf642db18fea7e354ad5a42052b8e
 #@sha256:0cdd76777a0dfd3dd3a63f215f030208ddb91c2361d2bcc02acec0f1c16b6a2e:musl-cross-make/sources/binutils-2.44.tar.gz
 #@sha256:a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898:musl-cross-make/sources/gmp-6.3.0.tar.xz
 #@sha256:b67ba0383ef7e8a8563734e2e889ef5ec3c3b898a01d00fa0a6869ad81c6ce01:musl-cross-make/sources/mpfr-4.2.2.tar.xz
@@ -62,9 +62,9 @@ for linkname in "$dd"'/x86_64-linux-musl/lib/'ld-musl-*so*; do
 done
 
 # Validate the compiler
-"$dd"'/bin/x86_64-linux-musl-gcc' --version
-"$dd"'/bin/x86_64-linux-musl-gcc' -o true true.c
-"$dd"'/bin/x86_64-linux-musl-readelf' --string-dump=.interp true >true.linker
+"$dd"'/command/x86_64-linux-musl-gcc' --version
+"$dd"'/command/x86_64-linux-musl-gcc' -o true true.c
+"$dd"'/command/x86_64-linux-musl-readelf' --string-dump=.interp true >true.linker
 grep -F "$pthbs_package" true.linker
 
 pkgs="gmp mpc mpfr zlib"
@@ -91,7 +91,7 @@ printf '%s\n' > "$dd/library/pkgconfig/zlib.pc" \
 
 
 # validate zlib
-"$dd"'/bin/x86_64-linux-musl-gcc' -I"$dd/include" -L"$dd/lib" -static -o zpipe zpipe.c -lz
+"$dd"'/command/x86_64-linux-musl-gcc' -I"$dd/include" -L"$dd/lib" -static -o zpipe zpipe.c -lz
 ./zpipe <true.c >true.c.gz
 ./zpipe -d <true.c.gz >true.c.2
 cmp -s true.c true.c.2
diff --git a/variants/root-x86_64/musl-cross-make:oldbootstrap-1 b/variants/root-x86_64/musl-cross-make:oldbootstrap-1
@@ -63,9 +63,9 @@ for linkname in "${pthbs_destdir%/}"'/versions/'"$pthbs_package"'/x86_64-linux-m
 done
 
 # Validate the compiler
-"${pthbs_destdir%/}"'/versions'"/$pthbs_package/bin/"'x86_64-linux-musl-gcc' --version
-"${pthbs_destdir%/}"'/versions'"/$pthbs_package/bin/"'x86_64-linux-musl-gcc' -o true true.c
-"${pthbs_destdir%/}"'/versions'"/$pthbs_package/bin/"'x86_64-linux-musl-readelf' --string-dump=.interp true >true.linker
+"$dest/command/"'x86_64-linux-musl-gcc' --version
+"$dest/command/"'x86_64-linux-musl-gcc' -o true true.c
+"$dest/command/"'x86_64-linux-musl-readelf' --string-dump=.interp true >true.linker
 grep -F "$pthbs_package" true.linker
 
 
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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+bison.689b0ac7f7a45d41f372049c7d98f890370e9be19479debe4382df77120ba3ff
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+bison.27c5b7956c7426266ddcc95f419638546fac55e2271d2f5f10a0bde2a90803ee
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+m4.6849dbf93ae1e108ae2029f7ced6c362830a26043691660f27adc424742fa16a
-#+netbsd-curses.2696ee31c0f10cee8e7726ec9a05bca70b1bb8037358302a1cf9318d8454a027
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+m4.993015f9bbec4bb286bd6ca07fef1e92776574dd009b502a0694e022314804cf
+#+netbsd-curses.20c8557bc5088f3ad2eefe900ba68e7a857704086ef24222818aaf2dae01f8f2
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.d6e4d0c8f32051b43336331e40b9a39283ad64548b83ecf0505270a37a0300af
-#+ocaml-findlib.9a0e455ea21d897a65847bc76e003d332590f4d0018f9469d606c2176b33eaab
-#+ocamlbuild.6a8b1cd2657a9b85403930b0a20d173f7e5cb819ba9173402430f89cc4ee1f48
-#+opam.0bb295fabdf1b9cbbdfae52ee1700d6814703b1122d9a8cd981f35e5b56ee21d
-#+ocaml-topkg.af2ca40b3a614218822f614924f5d5dd62da6856f8514625c5738b240bdae114
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+ocaml.639fb2aa6a03312b53679276a66821e7a85fa3f16cd56c2471532fb265089043
+#+ocaml-findlib.3404bee2ac0a70eec9f2bf497c8ebb994b4e07f36fe6e690238dbcb36b2f2b4a
+#+ocamlbuild.c09b4f24752688a263163095b8a8355f753faa7ffec75418d3d893f708318749
+#+opam.4f7c891974e3bb7549757dd076c9ca7bd2971650b3683f271c269745344d16a1
+#+ocaml-topkg.3f7cbad1f673fbfa3505157cef1383ad22c5fd6f8df4b37223c0173b538014bc
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.d6e4d0c8f32051b43336331e40b9a39283ad64548b83ecf0505270a37a0300af
-#+dune.01aa6ac9b7b891c47ffd80dcc0f3acf708b8d64f1ac4708aab963dbd11463e15
-#+ocaml_intrinsics_kernel.9aacc36d1428281e4f830ba8f798d173429e6c686231d9d0d1e7a85f4aa2005b
-#+ocaml-sexplib0.2e8373005f8a59778a94a2fcc7ce8c465c0b85ffc70991844543c1573ba5848f
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+ocaml.639fb2aa6a03312b53679276a66821e7a85fa3f16cd56c2471532fb265089043
+#+dune.f16ba7c009beeb356099e62188a127467b540f82fc100e9f881e3f804ec69986
+#+ocaml_intrinsics_kernel.114dbddfbe18f6317bf3208dc2a2d700628e8a09d902dc17ee378db0f68acb15
+#+ocaml-sexplib0.3e2e1991f6a257c41207a1ea8c7259d6ef664fca83e429b657da756a33e611d2
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.d6e4d0c8f32051b43336331e40b9a39283ad64548b83ecf0505270a37a0300af
-#+ocaml-findlib.9a0e455ea21d897a65847bc76e003d332590f4d0018f9469d606c2176b33eaab
-#+ocamlbuild.6a8b1cd2657a9b85403930b0a20d173f7e5cb819ba9173402430f89cc4ee1f48
-#+opam.0bb295fabdf1b9cbbdfae52ee1700d6814703b1122d9a8cd981f35e5b56ee21d
-#+ocaml-topkg.af2ca40b3a614218822f614924f5d5dd62da6856f8514625c5738b240bdae114
-#+ocaml-astring.a54211ea48cd5374bac1013ebf39a4963b68ba271eb50c3c77193686b516d4d8
-#+ocaml-fpath.85ca6bec2a070cad43b9696aed02ccbe9d05d6b92bcb32d12973d35a6e73ef2f
-#+ocaml-rresult.174c6f98a638d4284028b60bed81f5b6500695affe99148ffff22e8a0a2f095a
-#+ocaml-fmt.e5bfd65125fa4b7690d73cabfc3a592610c89ab126f3a9b9124ddeb89fead498
-#+ocaml-logs.86b1070821c6de729c169984fc30bc004fb659a9e921c960803cf93600b86af4
-#+ocaml-mtime.02a967a4c54acaf1fd3376b34e992358f08e94fcff0604569519d931dd88fbc9
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+ocaml.639fb2aa6a03312b53679276a66821e7a85fa3f16cd56c2471532fb265089043
+#+ocaml-findlib.3404bee2ac0a70eec9f2bf497c8ebb994b4e07f36fe6e690238dbcb36b2f2b4a
+#+ocamlbuild.c09b4f24752688a263163095b8a8355f753faa7ffec75418d3d893f708318749
+#+opam.4f7c891974e3bb7549757dd076c9ca7bd2971650b3683f271c269745344d16a1
+#+ocaml-topkg.3f7cbad1f673fbfa3505157cef1383ad22c5fd6f8df4b37223c0173b538014bc
+#+ocaml-astring.9c72d7585fc0d269cd02c8a858abf281a86b381143a0fe0fa22f8ea40f625049
+#+ocaml-fpath.0df055de1294b0f2798502c160d985c8071b4637db4b212dba21caa2dce40e48
+#+ocaml-rresult.e0bf0fb2ff5528eb83cb64a8ed6c984321db1bdc356fe927cd088f2929996bcf
+#+ocaml-fmt.3486e4d1112eb4ee2e941bd5a307890f87c7a20a6d9ae6b41142a34ed848a66f
+#+ocaml-logs.0b3d6a20fcb059111e56f26f401bb2ea1f3cd9aa6023d693406263217f935452
+#+ocaml-mtime.e5eb3ed0ccee8a7e585a910d1cc892fcaacbe915f33f7d5c9c0239dcc2ff7780
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.d6e4d0c8f32051b43336331e40b9a39283ad64548b83ecf0505270a37a0300af
-#+ocaml-findlib.9a0e455ea21d897a65847bc76e003d332590f4d0018f9469d606c2176b33eaab
-#+ocamlbuild.6a8b1cd2657a9b85403930b0a20d173f7e5cb819ba9173402430f89cc4ee1f48
-#+opam.0bb295fabdf1b9cbbdfae52ee1700d6814703b1122d9a8cd981f35e5b56ee21d
-#+ocaml-topkg.af2ca40b3a614218822f614924f5d5dd62da6856f8514625c5738b240bdae114
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+ocaml.639fb2aa6a03312b53679276a66821e7a85fa3f16cd56c2471532fb265089043
+#+ocaml-findlib.3404bee2ac0a70eec9f2bf497c8ebb994b4e07f36fe6e690238dbcb36b2f2b4a
+#+ocamlbuild.c09b4f24752688a263163095b8a8355f753faa7ffec75418d3d893f708318749
+#+opam.4f7c891974e3bb7549757dd076c9ca7bd2971650b3683f271c269745344d16a1
+#+ocaml-topkg.3f7cbad1f673fbfa3505157cef1383ad22c5fd6f8df4b37223c0173b538014bc
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.d6e4d0c8f32051b43336331e40b9a39283ad64548b83ecf0505270a37a0300af
-#+dune.01aa6ac9b7b891c47ffd80dcc0f3acf708b8d64f1ac4708aab963dbd11463e15
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+ocaml.639fb2aa6a03312b53679276a66821e7a85fa3f16cd56c2471532fb265089043
+#+dune.f16ba7c009beeb356099e62188a127467b540f82fc100e9f881e3f804ec69986
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.d6e4d0c8f32051b43336331e40b9a39283ad64548b83ecf0505270a37a0300af
-#+dune.01aa6ac9b7b891c47ffd80dcc0f3acf708b8d64f1ac4708aab963dbd11463e15
-#+ocamlbuild.6a8b1cd2657a9b85403930b0a20d173f7e5cb819ba9173402430f89cc4ee1f48
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+ocaml.639fb2aa6a03312b53679276a66821e7a85fa3f16cd56c2471532fb265089043
+#+dune.f16ba7c009beeb356099e62188a127467b540f82fc100e9f881e3f804ec69986
+#+ocamlbuild.c09b4f24752688a263163095b8a8355f753faa7ffec75418d3d893f708318749
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+m4.6849dbf93ae1e108ae2029f7ced6c362830a26043691660f27adc424742fa16a
-#+netbsd-curses.2696ee31c0f10cee8e7726ec9a05bca70b1bb8037358302a1cf9318d8454a027
-#+ocaml.d6e4d0c8f32051b43336331e40b9a39283ad64548b83ecf0505270a37a0300af
-#+ocamlbuild.6a8b1cd2657a9b85403930b0a20d173f7e5cb819ba9173402430f89cc4ee1f48
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+m4.993015f9bbec4bb286bd6ca07fef1e92776574dd009b502a0694e022314804cf
+#+netbsd-curses.20c8557bc5088f3ad2eefe900ba68e7a857704086ef24222818aaf2dae01f8f2
+#+ocaml.639fb2aa6a03312b53679276a66821e7a85fa3f16cd56c2471532fb265089043
+#+ocamlbuild.c09b4f24752688a263163095b8a8355f753faa7ffec75418d3d893f708318749
 #@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.d6e4d0c8f32051b43336331e40b9a39283ad64548b83ecf0505270a37a0300af"
+stdlib="$pthbs_destdir/versions/ocaml.639fb2aa6a03312b53679276a66821e7a85fa3f16cd56c2471532fb265089043"
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.d6e4d0c8f32051b43336331e40b9a39283ad64548b83ecf0505270a37a0300af
-#+ocaml-findlib.9a0e455ea21d897a65847bc76e003d332590f4d0018f9469d606c2176b33eaab
-#+ocamlbuild.6a8b1cd2657a9b85403930b0a20d173f7e5cb819ba9173402430f89cc4ee1f48
-#+opam.0bb295fabdf1b9cbbdfae52ee1700d6814703b1122d9a8cd981f35e5b56ee21d
-#+ocaml-topkg.af2ca40b3a614218822f614924f5d5dd62da6856f8514625c5738b240bdae114
-#+ocaml-cmdliner.3f06808322ffb4ecd40a45d8fa8cf320a8121cc2cc5209494b310575ddb77e18
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+ocaml.639fb2aa6a03312b53679276a66821e7a85fa3f16cd56c2471532fb265089043
+#+ocaml-findlib.3404bee2ac0a70eec9f2bf497c8ebb994b4e07f36fe6e690238dbcb36b2f2b4a
+#+ocamlbuild.c09b4f24752688a263163095b8a8355f753faa7ffec75418d3d893f708318749
+#+opam.4f7c891974e3bb7549757dd076c9ca7bd2971650b3683f271c269745344d16a1
+#+ocaml-topkg.3f7cbad1f673fbfa3505157cef1383ad22c5fd6f8df4b37223c0173b538014bc
+#+ocaml-cmdliner.172bca251c2082c83cf3521b0cea52c22c8b2e84da7a1f1cb4f0a5b6ab4b5863
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.d6e4d0c8f32051b43336331e40b9a39283ad64548b83ecf0505270a37a0300af
-#+ocaml-findlib.9a0e455ea21d897a65847bc76e003d332590f4d0018f9469d606c2176b33eaab
-#+ocamlbuild.6a8b1cd2657a9b85403930b0a20d173f7e5cb819ba9173402430f89cc4ee1f48
-#+opam.0bb295fabdf1b9cbbdfae52ee1700d6814703b1122d9a8cd981f35e5b56ee21d
-#+ocaml-topkg.af2ca40b3a614218822f614924f5d5dd62da6856f8514625c5738b240bdae114
-#+ocaml-astring.a54211ea48cd5374bac1013ebf39a4963b68ba271eb50c3c77193686b516d4d8
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+ocaml.639fb2aa6a03312b53679276a66821e7a85fa3f16cd56c2471532fb265089043
+#+ocaml-findlib.3404bee2ac0a70eec9f2bf497c8ebb994b4e07f36fe6e690238dbcb36b2f2b4a
+#+ocamlbuild.c09b4f24752688a263163095b8a8355f753faa7ffec75418d3d893f708318749
+#+opam.4f7c891974e3bb7549757dd076c9ca7bd2971650b3683f271c269745344d16a1
+#+ocaml-topkg.3f7cbad1f673fbfa3505157cef1383ad22c5fd6f8df4b37223c0173b538014bc
+#+ocaml-astring.9c72d7585fc0d269cd02c8a858abf281a86b381143a0fe0fa22f8ea40f625049
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.d6e4d0c8f32051b43336331e40b9a39283ad64548b83ecf0505270a37a0300af
-#+ocaml-findlib.9a0e455ea21d897a65847bc76e003d332590f4d0018f9469d606c2176b33eaab
-#+ocamlbuild.6a8b1cd2657a9b85403930b0a20d173f7e5cb819ba9173402430f89cc4ee1f48
-#+opam.0bb295fabdf1b9cbbdfae52ee1700d6814703b1122d9a8cd981f35e5b56ee21d
-#+ocaml-topkg.af2ca40b3a614218822f614924f5d5dd62da6856f8514625c5738b240bdae114
-#+ocaml-mtime.02a967a4c54acaf1fd3376b34e992358f08e94fcff0604569519d931dd88fbc9
-#+ocaml-cmdliner.3f06808322ffb4ecd40a45d8fa8cf320a8121cc2cc5209494b310575ddb77e18
-#+ocaml-fmt.e5bfd65125fa4b7690d73cabfc3a592610c89ab126f3a9b9124ddeb89fead498
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+ocaml.639fb2aa6a03312b53679276a66821e7a85fa3f16cd56c2471532fb265089043
+#+ocaml-findlib.3404bee2ac0a70eec9f2bf497c8ebb994b4e07f36fe6e690238dbcb36b2f2b4a
+#+ocamlbuild.c09b4f24752688a263163095b8a8355f753faa7ffec75418d3d893f708318749
+#+opam.4f7c891974e3bb7549757dd076c9ca7bd2971650b3683f271c269745344d16a1
+#+ocaml-topkg.3f7cbad1f673fbfa3505157cef1383ad22c5fd6f8df4b37223c0173b538014bc
+#+ocaml-mtime.e5eb3ed0ccee8a7e585a910d1cc892fcaacbe915f33f7d5c9c0239dcc2ff7780
+#+ocaml-cmdliner.172bca251c2082c83cf3521b0cea52c22c8b2e84da7a1f1cb4f0a5b6ab4b5863
+#+ocaml-fmt.3486e4d1112eb4ee2e941bd5a307890f87c7a20a6d9ae6b41142a34ed848a66f
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.d6e4d0c8f32051b43336331e40b9a39283ad64548b83ecf0505270a37a0300af
-#+dune.01aa6ac9b7b891c47ffd80dcc0f3acf708b8d64f1ac4708aab963dbd11463e15
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+ocaml.639fb2aa6a03312b53679276a66821e7a85fa3f16cd56c2471532fb265089043
+#+dune.f16ba7c009beeb356099e62188a127467b540f82fc100e9f881e3f804ec69986
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.d6e4d0c8f32051b43336331e40b9a39283ad64548b83ecf0505270a37a0300af
-#+ocaml-findlib.9a0e455ea21d897a65847bc76e003d332590f4d0018f9469d606c2176b33eaab
-#+ocamlbuild.6a8b1cd2657a9b85403930b0a20d173f7e5cb819ba9173402430f89cc4ee1f48
-#+opam.0bb295fabdf1b9cbbdfae52ee1700d6814703b1122d9a8cd981f35e5b56ee21d
-#+ocaml-topkg.af2ca40b3a614218822f614924f5d5dd62da6856f8514625c5738b240bdae114
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+ocaml.639fb2aa6a03312b53679276a66821e7a85fa3f16cd56c2471532fb265089043
+#+ocaml-findlib.3404bee2ac0a70eec9f2bf497c8ebb994b4e07f36fe6e690238dbcb36b2f2b4a
+#+ocamlbuild.c09b4f24752688a263163095b8a8355f753faa7ffec75418d3d893f708318749
+#+opam.4f7c891974e3bb7549757dd076c9ca7bd2971650b3683f271c269745344d16a1
+#+ocaml-topkg.3f7cbad1f673fbfa3505157cef1383ad22c5fd6f8df4b37223c0173b538014bc
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.d6e4d0c8f32051b43336331e40b9a39283ad64548b83ecf0505270a37a0300af
-#+dune.01aa6ac9b7b891c47ffd80dcc0f3acf708b8d64f1ac4708aab963dbd11463e15
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+ocaml.639fb2aa6a03312b53679276a66821e7a85fa3f16cd56c2471532fb265089043
+#+dune.f16ba7c009beeb356099e62188a127467b540f82fc100e9f881e3f804ec69986
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.d6e4d0c8f32051b43336331e40b9a39283ad64548b83ecf0505270a37a0300af
-#+dune.01aa6ac9b7b891c47ffd80dcc0f3acf708b8d64f1ac4708aab963dbd11463e15
-#+ocaml-compiler-libs.b6b5131209200182a1629c6008429b24e84d0c7ef45d691cf27879f6fb457c2f
-#+ocaml-cppo.ed41faa9823029ea8707a8b8dc0bc089bb2edd8d043c912ed94745f25e8188f2
-#+ocaml-findlib.9a0e455ea21d897a65847bc76e003d332590f4d0018f9469d606c2176b33eaab
-#+ocaml-ppx_derivers.9733c5c373650b3e8116d56260c7addf7a4224e8ed5c07df4d104c24ff43a19f
-#+ocaml-ppxlib.d59ddadd912e2de52bde49dc9c010b38f6c96bb56a2f13645b0122117b7f9b62
-#+ocaml-sexplib0.2e8373005f8a59778a94a2fcc7ce8c465c0b85ffc70991844543c1573ba5848f
-#+ocaml-stdlib-shims.c035023b2016e22c38e8829ca89f1632793f14812c86c587569bbf72ed080a88
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+ocaml.639fb2aa6a03312b53679276a66821e7a85fa3f16cd56c2471532fb265089043
+#+dune.f16ba7c009beeb356099e62188a127467b540f82fc100e9f881e3f804ec69986
+#+ocaml-compiler-libs.e56be7d487da18652da9c598e83e0e69cbbb281acef3d53135067ea5a39b9c56
+#+ocaml-cppo.d440f3f32edb30e97ae4f25e87e154b52a1b03550b53458952d6fe7168856cba
+#+ocaml-findlib.3404bee2ac0a70eec9f2bf497c8ebb994b4e07f36fe6e690238dbcb36b2f2b4a
+#+ocaml-ppx_derivers.ca2c8a5a71679bf61626307202d2f1ad26c25171348457494c76b2bcc4aa71db
+#+ocaml-ppxlib.37b74b0eccfedd07fb31169d1b01bf3964b5dda079f52a9a7b1f3b9c51bf7b3a
+#+ocaml-sexplib0.3e2e1991f6a257c41207a1ea8c7259d6ef664fca83e429b657da756a33e611d2
+#+ocaml-stdlib-shims.af71feefcbefe40a3c3d9f25deb36773fee184fd88ab388db89e8b60ada213a8
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.d6e4d0c8f32051b43336331e40b9a39283ad64548b83ecf0505270a37a0300af
-#+dune.01aa6ac9b7b891c47ffd80dcc0f3acf708b8d64f1ac4708aab963dbd11463e15
-#+ocaml-compiler-libs.b6b5131209200182a1629c6008429b24e84d0c7ef45d691cf27879f6fb457c2f
-#+ocaml-ppx_derivers.9733c5c373650b3e8116d56260c7addf7a4224e8ed5c07df4d104c24ff43a19f
-#+ocaml-sexplib0.2e8373005f8a59778a94a2fcc7ce8c465c0b85ffc70991844543c1573ba5848f
-#+ocaml-stdlib-shims.c035023b2016e22c38e8829ca89f1632793f14812c86c587569bbf72ed080a88
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+ocaml.639fb2aa6a03312b53679276a66821e7a85fa3f16cd56c2471532fb265089043
+#+dune.f16ba7c009beeb356099e62188a127467b540f82fc100e9f881e3f804ec69986
+#+ocaml-compiler-libs.e56be7d487da18652da9c598e83e0e69cbbb281acef3d53135067ea5a39b9c56
+#+ocaml-ppx_derivers.ca2c8a5a71679bf61626307202d2f1ad26c25171348457494c76b2bcc4aa71db
+#+ocaml-sexplib0.3e2e1991f6a257c41207a1ea8c7259d6ef664fca83e429b657da756a33e611d2
+#+ocaml-stdlib-shims.af71feefcbefe40a3c3d9f25deb36773fee184fd88ab388db89e8b60ada213a8
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.d6e4d0c8f32051b43336331e40b9a39283ad64548b83ecf0505270a37a0300af
-#+ocaml-findlib.9a0e455ea21d897a65847bc76e003d332590f4d0018f9469d606c2176b33eaab
-#+ocamlbuild.6a8b1cd2657a9b85403930b0a20d173f7e5cb819ba9173402430f89cc4ee1f48
-#+opam.0bb295fabdf1b9cbbdfae52ee1700d6814703b1122d9a8cd981f35e5b56ee21d
-#+ocaml-topkg.af2ca40b3a614218822f614924f5d5dd62da6856f8514625c5738b240bdae114
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+ocaml.639fb2aa6a03312b53679276a66821e7a85fa3f16cd56c2471532fb265089043
+#+ocaml-findlib.3404bee2ac0a70eec9f2bf497c8ebb994b4e07f36fe6e690238dbcb36b2f2b4a
+#+ocamlbuild.c09b4f24752688a263163095b8a8355f753faa7ffec75418d3d893f708318749
+#+opam.4f7c891974e3bb7549757dd076c9ca7bd2971650b3683f271c269745344d16a1
+#+ocaml-topkg.3f7cbad1f673fbfa3505157cef1383ad22c5fd6f8df4b37223c0173b538014bc
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.d6e4d0c8f32051b43336331e40b9a39283ad64548b83ecf0505270a37a0300af
-#+dune.01aa6ac9b7b891c47ffd80dcc0f3acf708b8d64f1ac4708aab963dbd11463e15
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+ocaml.639fb2aa6a03312b53679276a66821e7a85fa3f16cd56c2471532fb265089043
+#+dune.f16ba7c009beeb356099e62188a127467b540f82fc100e9f881e3f804ec69986
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.d6e4d0c8f32051b43336331e40b9a39283ad64548b83ecf0505270a37a0300af
-#+dune.01aa6ac9b7b891c47ffd80dcc0f3acf708b8d64f1ac4708aab963dbd11463e15
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+ocaml.639fb2aa6a03312b53679276a66821e7a85fa3f16cd56c2471532fb265089043
+#+dune.f16ba7c009beeb356099e62188a127467b540f82fc100e9f881e3f804ec69986
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.d6e4d0c8f32051b43336331e40b9a39283ad64548b83ecf0505270a37a0300af
-#+ocaml-findlib.9a0e455ea21d897a65847bc76e003d332590f4d0018f9469d606c2176b33eaab
-#+ocamlbuild.6a8b1cd2657a9b85403930b0a20d173f7e5cb819ba9173402430f89cc4ee1f48
-#+opam.0bb295fabdf1b9cbbdfae52ee1700d6814703b1122d9a8cd981f35e5b56ee21d
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+ocaml.639fb2aa6a03312b53679276a66821e7a85fa3f16cd56c2471532fb265089043
+#+ocaml-findlib.3404bee2ac0a70eec9f2bf497c8ebb994b4e07f36fe6e690238dbcb36b2f2b4a
+#+ocamlbuild.c09b4f24752688a263163095b8a8355f753faa7ffec75418d3d893f708318749
+#+opam.4f7c891974e3bb7549757dd076c9ca7bd2971650b3683f271c269745344d16a1
 #@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.d6e4d0c8f32051b43336331e40b9a39283ad64548b83ecf0505270a37a0300af
-#+dune.01aa6ac9b7b891c47ffd80dcc0f3acf708b8d64f1ac4708aab963dbd11463e15
-#+ocamlbuild.6a8b1cd2657a9b85403930b0a20d173f7e5cb819ba9173402430f89cc4ee1f48
-#+ocaml-base.ddd4a267e24951e92042ce7f31b7e4943600b1dcded301ba797828784a73806d
-#+opam.0bb295fabdf1b9cbbdfae52ee1700d6814703b1122d9a8cd981f35e5b56ee21d
-#+ocaml-bos.5ab1065db6c5cc539664aa00e6714189232b81e2f4b8cb0c9007c596c50e2301
-#+ocaml-lun.c31c7f876cd14f88e869330428c9de41228691a86f6c795561ae18eae3e57f49
-#+ocaml-ppx_deriving.6e701a92fd0e1f4fbf26a55c2d0cae02fd0ba4a369fecc4cbe537fd88e3f06fe-
\ No newline at end of file
+#+ocaml.639fb2aa6a03312b53679276a66821e7a85fa3f16cd56c2471532fb265089043
+#+dune.f16ba7c009beeb356099e62188a127467b540f82fc100e9f881e3f804ec69986
+#+ocamlbuild.c09b4f24752688a263163095b8a8355f753faa7ffec75418d3d893f708318749
+#+ocaml-base.007a924463a6c174c3ffdda6e92a63e843a1de1120c126a7a1bf89074e034a72
+#+opam.4f7c891974e3bb7549757dd076c9ca7bd2971650b3683f271c269745344d16a1
+#+ocaml-bos.a882fbc7e3594df06ec01ac41fdb6a7181de0cc60959b4c4f2b73b6b49b60ab8
+#+ocaml-lun.f04d681d36991adadcede108bf10dcf198298441487fcd1a3a33ec220db0a0d5
+#+ocaml-ppx_deriving.4dc61087ba918423170030cbecd74f88f7e56f027a8d60ee9a02edaa9e06c7f9+
\ 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+m4.6849dbf93ae1e108ae2029f7ced6c362830a26043691660f27adc424742fa16a
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+m4.993015f9bbec4bb286bd6ca07fef1e92776574dd009b502a0694e022314804cf
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+ocaml.d6e4d0c8f32051b43336331e40b9a39283ad64548b83ecf0505270a37a0300af
-#+dune.01aa6ac9b7b891c47ffd80dcc0f3acf708b8d64f1ac4708aab963dbd11463e15
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+ocaml.639fb2aa6a03312b53679276a66821e7a85fa3f16cd56c2471532fb265089043
+#+dune.f16ba7c009beeb356099e62188a127467b540f82fc100e9f881e3f804ec69986
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+m4.6849dbf93ae1e108ae2029f7ced6c362830a26043691660f27adc424742fa16a
-#+ocaml.d6e4d0c8f32051b43336331e40b9a39283ad64548b83ecf0505270a37a0300af
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+m4.993015f9bbec4bb286bd6ca07fef1e92776574dd009b502a0694e022314804cf
+#+ocaml.639fb2aa6a03312b53679276a66821e7a85fa3f16cd56c2471532fb265089043
 #@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.d6e4d0c8f32051b43336331e40b9a39283ad64548b83ecf0505270a37a0300af"
+stdlib="$pthbs_destdir/versions/ocaml.639fb2aa6a03312b53679276a66821e7a85fa3f16cd56c2471532fb265089043"
 mkdir -p "${stdlib%/*}"
 ln -s "$pthbs_package" "$stdlib"
 
diff --git a/variants/root-x86_64/oldbootstrap.environment b/variants/root-x86_64/oldbootstrap.environment
@@ -1,4 +1,4 @@
 #!/usr/bin/env pthbs-build
-#+busybox.8b6145faa03d2459be5dcb6fe35da12c53ceec094ac0b689fb6cf7212c227497
-#+gnu-make.660bdddbe6db0afa21a50e6c13cabc7fc14f8ea2dbe29ab2fe0ce8639b085b2d
-#+musl-cross-make.5150a4911ed839b84d0c13ec1f279fa0c0593458060b120ed57198c4d7d43fca-
\ No newline at end of file
+#+busybox.894b0a70452d0be23fe59c0c800bb70ab40bf642db18fea7e354ad5a42052b8e
+#+gnu-make.2ff3aad4abc49ad3e4983ee16ba0d31b8776a3b1c8f3d8f0d9ea20171d18130f
+#+musl-cross-make.58c5a93650d712a41f2b389dc1f717bf31ffaa06f6d769bf31212ab045c52150+
\ No newline at end of file
diff --git a/variants/root-x86_64/oldsystem.environment b/variants/root-x86_64/oldsystem.environment
@@ -1,4 +1,4 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.521ed668f18e5a89c45bcb2cd229f293cbdcae8b2e3650002cfa0c37ada9009e
-#+busybox.c228e75fc794e734a3019d7e4432c910d21bea89f168d01a2fb085e90a11c40e
-#+gnu-make.5bbc4d6833bf439fc28313335283df3d7b9023048105da7e6287d2de23bc1dc4-
\ No newline at end of file
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+busybox.c27c084ec54d2209486acf4ca45183da74e6cc81076107f74b35644c0d8854ad
+#+gnu-make.d246117757a781f63d3346138d83d166b8445c520cc998b03d7c6d73dbc9f483+
\ No newline at end of file
diff --git a/variants/root-x86_64/opam b/variants/root-x86_64/opam
@@ -1,41 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+diffutils.dfd984d13bd34144fee458d165c7bdc84345c6fd89db7f8359f0c64bd0aab739
-#+patch.b094bff23ba91b83014fa4913272d726f6d454161c0eaf92e3034ff0bf41d4ed
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+getconf.0968844b268686a1c17deef82461673aabaecc51795827bec19e2562fa288112
-#+ocaml.d6e4d0c8f32051b43336331e40b9a39283ad64548b83ecf0505270a37a0300af
-#+dune.01aa6ac9b7b891c47ffd80dcc0f3acf708b8d64f1ac4708aab963dbd11463e15
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+diffutils.d2f4ec34328287b5d8663726c2a48e2868a5189cbf25b6513b7405e5d3b8838f
+#+patch.8e0c7cb577376dc28779fc98e3fca226002f90fbd8f71a592926d4f92023afab
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+getconf.2ed3e178cc3f676e38c4d9424e3a351490a50c954fbc573f31752ab97a2d1b64
+#+ocaml.639fb2aa6a03312b53679276a66821e7a85fa3f16cd56c2471532fb265089043
+#+dune.f16ba7c009beeb356099e62188a127467b540f82fc100e9f881e3f804ec69986
 #@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.01aa6ac9b7b891c47ffd80dcc0f3acf708b8d64f1ac4708aab963dbd11463e15/command/dune' \
+	--with-dune='/versions/dune.f16ba7c009beeb356099e62188a127467b540f82fc100e9f881e3f804ec69986/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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+m4.6849dbf93ae1e108ae2029f7ced6c362830a26043691660f27adc424742fa16a
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+m4.993015f9bbec4bb286bd6ca07fef1e92776574dd009b502a0694e022314804cf
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+m4.6849dbf93ae1e108ae2029f7ced6c362830a26043691660f27adc424742fa16a
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+m4.993015f9bbec4bb286bd6ca07fef1e92776574dd009b502a0694e022314804cf
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+pkgconf.090569dd9708af2792899b2dafa80327a0f1e025e1cd7d377f121d452ee5813b
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+pkgconf.516fd5e66f6099b5124debdea77793f5084cfe31602df60c2a41a4a6dbe35948
 
 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+m4.6849dbf93ae1e108ae2029f7ced6c362830a26043691660f27adc424742fa16a
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+m4.993015f9bbec4bb286bd6ca07fef1e92776574dd009b502a0694e022314804cf
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+zsh.491fef7a15462a76f8cb84640d3127c4654aacebd87064bd3e486e81c5b8f397
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+zsh.253499e46e90e47c8bf3342e6fe39cabf18532fc150b6da2ce0418aef3287c67
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+m4.6849dbf93ae1e108ae2029f7ced6c362830a26043691660f27adc424742fa16a
-#+nawk.3a9c93692a78bb3c37d0ad5e2b0631bb738f46b7865b7b565e27d48b1efb4f2a
-#+popt.faa3df58112e51becb17a7295cd8b69dd68bd5d580c04d13c141debffd58ab88
-#+libressl.b4bccfabdae12bd61d28f482e64cdc9789cc45698f4aa8a0108b01a667b06034
-#+zstd.c25185f0b25386e2ad693c76b6f644050ed5cc03cd0830a7e11bbb7de560b519
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+m4.993015f9bbec4bb286bd6ca07fef1e92776574dd009b502a0694e022314804cf
+#+nawk.fffd06b71160c3ac0063c67529276c6483b1906cf5823d690569e4225cfdaa06
+#+popt.9027dad85e3f3cc4046f65eb9e8523765146e1015e56674ddf3efb6a06cc27db
+#+libressl.cfc609041b4eb1c994e2429d12fd2f73dff8ce206109924ff014850f1c4f40e3
+#+zstd.fdf9bf1f2931783deccfbb1ac6eeddd10f0ee96cbbd60bed4a8a2b377bdfa60b
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+skalibs.787f60b4d32f3e72df949c0038350cc0d9b245c09a9912a8d1d2bade9f578f73
-#+execline.b5cddad4acb4764712c5b11b272a74b1dfeea5ff1b0aa56e2b2e24102e26f8fc
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+skalibs.fbcd4d1b74a23b27ad4dd4830c82b6b34df76ed3819fd9a523d80daac8bc5988
+#+execline.f071229a774a18a54adce907ed0762c0bb4cae080e0bc616fd07d69355331e91
 #@git:0e02fe0e92b8f9a619fc355babad2c78c009c1f1:s6
 
 
@@ -49,7 +47,7 @@ cd 's6'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.787f60b4d32f3e72df949c0038350cc0d9b245c09a9912a8d1d2bade9f578f73/sysdeps' \
+	--with-sysdeps='/versions/skalibs.fbcd4d1b74a23b27ad4dd4830c82b6b34df76ed3819fd9a523d80daac8bc5988/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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+skalibs.787f60b4d32f3e72df949c0038350cc0d9b245c09a9912a8d1d2bade9f578f73
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+skalibs.fbcd4d1b74a23b27ad4dd4830c82b6b34df76ed3819fd9a523d80daac8bc5988
 #@git:dc80225c0a78346300d100f0bf0182ed338c4b01:s6-dns
 
 
@@ -48,7 +46,7 @@ cd 's6-dns'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.787f60b4d32f3e72df949c0038350cc0d9b245c09a9912a8d1d2bade9f578f73/sysdeps' \
+	--with-sysdeps='/versions/skalibs.fbcd4d1b74a23b27ad4dd4830c82b6b34df76ed3819fd9a523d80daac8bc5988/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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+skalibs.787f60b4d32f3e72df949c0038350cc0d9b245c09a9912a8d1d2bade9f578f73
-#+execline.b5cddad4acb4764712c5b11b272a74b1dfeea5ff1b0aa56e2b2e24102e26f8fc
-#+s6.b466f661193b05290d00f1047805079f131653fa545378c427caf96ba2413129
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+skalibs.fbcd4d1b74a23b27ad4dd4830c82b6b34df76ed3819fd9a523d80daac8bc5988
+#+execline.f071229a774a18a54adce907ed0762c0bb4cae080e0bc616fd07d69355331e91
+#+s6.a052ec72e8699f44f9d85f9130603aaa135e809769002c6cb94c5b7d4e0a224c
 #@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.787f60b4d32f3e72df949c0038350cc0d9b245c09a9912a8d1d2bade9f578f73/sysdeps' \
+	--with-sysdeps='/versions/skalibs.fbcd4d1b74a23b27ad4dd4830c82b6b34df76ed3819fd9a523d80daac8bc5988/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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+skalibs.787f60b4d32f3e72df949c0038350cc0d9b245c09a9912a8d1d2bade9f578f73
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+skalibs.fbcd4d1b74a23b27ad4dd4830c82b6b34df76ed3819fd9a523d80daac8bc5988
 #@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.787f60b4d32f3e72df949c0038350cc0d9b245c09a9912a8d1d2bade9f578f73/sysdeps' \
+	--with-sysdeps='/versions/skalibs.fbcd4d1b74a23b27ad4dd4830c82b6b34df76ed3819fd9a523d80daac8bc5988/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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+skalibs.787f60b4d32f3e72df949c0038350cc0d9b245c09a9912a8d1d2bade9f578f73
-#+execline.b5cddad4acb4764712c5b11b272a74b1dfeea5ff1b0aa56e2b2e24102e26f8fc
-#+s6.b466f661193b05290d00f1047805079f131653fa545378c427caf96ba2413129
-#+s6-dns.6cdfdfccc07560c084c9a29948d25bdb466bc0e6d3eab64fbf50334533cda59e
-#+libressl.b4bccfabdae12bd61d28f482e64cdc9789cc45698f4aa8a0108b01a667b06034
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+skalibs.fbcd4d1b74a23b27ad4dd4830c82b6b34df76ed3819fd9a523d80daac8bc5988
+#+execline.f071229a774a18a54adce907ed0762c0bb4cae080e0bc616fd07d69355331e91
+#+s6.a052ec72e8699f44f9d85f9130603aaa135e809769002c6cb94c5b7d4e0a224c
+#+s6-dns.ae463f4376e39aa473759b65643e39340158941ed7e485993f8b5f2515db816b
+#+libressl.cfc609041b4eb1c994e2429d12fd2f73dff8ce206109924ff014850f1c4f40e3
 #@git:12b40106ed1727274cd6af379c4ba0ca7161700b:s6-networking
 
 
@@ -52,7 +50,7 @@ cd 's6-networking'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.787f60b4d32f3e72df949c0038350cc0d9b245c09a9912a8d1d2bade9f578f73/sysdeps' \
+	--with-sysdeps='/versions/skalibs.fbcd4d1b74a23b27ad4dd4830c82b6b34df76ed3819fd9a523d80daac8bc5988/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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+skalibs.787f60b4d32f3e72df949c0038350cc0d9b245c09a9912a8d1d2bade9f578f73
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+skalibs.fbcd4d1b74a23b27ad4dd4830c82b6b34df76ed3819fd9a523d80daac8bc5988
 #@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.787f60b4d32f3e72df949c0038350cc0d9b245c09a9912a8d1d2bade9f578f73/sysdeps' \
+	--with-sysdeps='/versions/skalibs.fbcd4d1b74a23b27ad4dd4830c82b6b34df76ed3819fd9a523d80daac8bc5988/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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+skalibs.787f60b4d32f3e72df949c0038350cc0d9b245c09a9912a8d1d2bade9f578f73
-#+execline.b5cddad4acb4764712c5b11b272a74b1dfeea5ff1b0aa56e2b2e24102e26f8fc
-#+s6.b466f661193b05290d00f1047805079f131653fa545378c427caf96ba2413129
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+skalibs.fbcd4d1b74a23b27ad4dd4830c82b6b34df76ed3819fd9a523d80daac8bc5988
+#+execline.f071229a774a18a54adce907ed0762c0bb4cae080e0bc616fd07d69355331e91
+#+s6.a052ec72e8699f44f9d85f9130603aaa135e809769002c6cb94c5b7d4e0a224c
 #@git:a4756f00b3823952580d1fee704675c6f813a248:s6-rc
 
 
@@ -50,7 +48,7 @@ cd 's6-rc'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.787f60b4d32f3e72df949c0038350cc0d9b245c09a9912a8d1d2bade9f578f73/sysdeps' \
+	--with-sysdeps='/versions/skalibs.fbcd4d1b74a23b27ad4dd4830c82b6b34df76ed3819fd9a523d80daac8bc5988/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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+zsh.491fef7a15462a76f8cb84640d3127c4654aacebd87064bd3e486e81c5b8f397
-#+pthbs-banginstall.d123c717dcdbde6e3fca02bfe008b86639549ef95fa48b303ee0a31b778e6a79
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+zsh.253499e46e90e47c8bf3342e6fe39cabf18532fc150b6da2ce0418aef3287c67
+#+pthbs-banginstall.22166fce84053bfb8337f83bf61b27e7a839dcf642aa08b93ea3575b5b97fc37
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+attr.0357fac1aa91a57576599782b8e22d2f0d3247f1db90cb513f6052d47d3c7399
-#+zstd.c25185f0b25386e2ad693c76b6f644050ed5cc03cd0830a7e11bbb7de560b519
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+attr.9ffe382c581a8af0378ee487d80218a4b7bf4568b7766779df2779dfb8f13486
+#+zstd.fdf9bf1f2931783deccfbb1ac6eeddd10f0ee96cbbd60bed4a8a2b377bdfa60b
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+m4.6849dbf93ae1e108ae2029f7ced6c362830a26043691660f27adc424742fa16a
-#+patch.b094bff23ba91b83014fa4913272d726f6d454161c0eaf92e3034ff0bf41d4ed
-#+libunwind.2a7c67e6937401d6e8dfa414fffc6fc9d5c6887a6afca5ad227b7849dd7c73a4
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+m4.993015f9bbec4bb286bd6ca07fef1e92776574dd009b502a0694e022314804cf
+#+patch.8e0c7cb577376dc28779fc98e3fca226002f90fbd8f71a592926d4f92023afab
+#+libunwind.63d0e02d5313a076c3612ae1d6af9647cf9cae905f57a4cc3942a26616be2397
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-dosfstools.3ff39c63382b6b03a08e8537f83ed369d79164639a6de6a2b4d1295fdebac6ae
-#+busybox-e2fsprogs.31a5c9c96125f6799ba7866d653ae89f06a87e663f9b31438bc39b79acbed359
-#+busybox-iproute2.072dcebb6cd720f7152743ab12ad17d518dc1e28fd7b7309761da8be4935099f
-#+busybox-iputils.7c10dd88e641b57ca5dfcacc0cbc9210502dff5a6e41fabd672f10a72b132285
-#+busybox-net-misc.54f5b29e415face0c32ad0665d64f13480ac484b2d7886ec49d7f121d53ae125
-#+busybox-net-tools.295483b75ff13c99324fd37b31b59a3e1165ee833f64f806d97543d9b18f7604
-#+busybox-traceroute.6c64ac9fe49fb24f22ef7e18d7c875352cd7827548dba0c744409578feb8a161
-#+busybox-wget.5e1571cf15bb996e12df92c313a1cb07525755889f47c3b946bff1230c319758
-#+busybox-chpst.24e924deb368b54bc6f9fe49299aa8711d9dd4ce5d85feba215154624097401e
-#+busybox-console.2b3cf0502e26d5b9fc80a40ace4e52c76d3859b91be4a2fb45850226e1eb0d45
-#+busybox-getty.d9ebe92822354e261decfccfb25186cbe2377287c23441585c8c9539d6ead732
-#+busybox-i2c-tools.2209c167c4edbc49f643883917d612dd9ca53d67e4e523d576ecf03b21eac1ac
-#+busybox-linux-extra.b2e2d3f8674b4b1cf73d748fd5cc54e98d083439436a522804864dd8b84416a5
-#+busybox-mtd-utils.3e2065e2c74963525536e038a1fc931b16974e098c2d5712b0efc5a6484011b6
-#+busybox-shadow.681f9ffa9dbc7744cb3b16e150296d365df8cefcb40b067742e934e8b4a7eeb1
-#+busybox-su.1d9e70cc1dff427b7df5e1a99ec64a1d59dd1c9b61fba3c5d2d4c1059d6f946b
-#+busybox-util-linux-priv.76728340753177c7161f5146097db31497888855d4f4006937148eff28985418
-#+busybox-logging.b24acbeb998f38d492fa072de773459bfe02f3907337dd62b4349c7dc3668b9c
-#+busybox-cron.128d5e0df464faf29ad16c32ad983361c2c9d242c036cdaa7e0dc0870073e47f
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+nawk.3a9c93692a78bb3c37d0ad5e2b0631bb738f46b7865b7b565e27d48b1efb4f2a
-#+diffutils.dfd984d13bd34144fee458d165c7bdc84345c6fd89db7f8359f0c64bd0aab739
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+aat.8037c298bd189ef350247ef00e3d3ad891c96a44c4af57a72b29d6f4ad9bd729
-#+fileset.b52f41c7eb15fbdc28d66d3559134ac5c2a57a57bfc60ab2b3a05def8cfe55a0
-#+rsync.192dcf4c758c44a1345543b32ad13510c4edf04a9347f0a23a4ccbfb7af69464
-#+execline.b5cddad4acb4764712c5b11b272a74b1dfeea5ff1b0aa56e2b2e24102e26f8fc
-#+kbd.b16d11f5262aec9cae19cefd62372ce8df646fad32a01407e1b5d0f4b8c37a6a
-#+mdevd.e603d4269e76fdb6d56104c36bf95b4b0256506029941fc4aa3276d9facb0826
-#+s6-linux-utils.fe96f77725356d70a42b7d2b9b1aaa75adba6976db8658e154284b029f228355
-#+s6-rc.911b7518a2721bc13cba9a597e0e058ed8aa402fe68e8d88b94e62c3c2a59712
-#+s6.b466f661193b05290d00f1047805079f131653fa545378c427caf96ba2413129
-#+zsh.491fef7a15462a76f8cb84640d3127c4654aacebd87064bd3e486e81c5b8f397
-#+libcgroup.7da617e582e7414be0632d53e4fe5481ee2d932a6f303435fade1136f5c4b6a6
-#+system-config-scripts.29bd497a538ca1ae3e71cd4e0443d579b69fe8d8ab37bfd2cbde00c6685b2778
-#+logincaps.8df05ce6f79a7092d14ee5d4bb55245c726546babad3573827d47538b5b8b30a
-#+busybox-modutils.e5d03d2b260914125875697fe02518c1b4e527b2bb48b3d2e45a4263b4088208
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-dosfstools.7fc1a0ab553cc02e7ee18eed4e8315fe490e6dd8bbc5ca2e7837b530d055d3fd
+#+busybox-e2fsprogs.56e3ce469476cd9bc42cde64b731921a18353f354d970b071c4acebcb8478f75
+#+busybox-iproute2.0601716fc4401a2290eb2041743098400253853932da5d34d1f1e31d7d858364
+#+busybox-iputils.3b8da87d82a0f83c0387730d4f98c77688eff37abd170b4be411657fc1680dd1
+#+busybox-net-misc.14697e6f6b73b6905a116326b8ad414a0581c90648ba502a9db94052e916eeaa
+#+busybox-net-tools.494716813146ea60c7b3ff18784483abc202084691262f996ff973add3fa31b1
+#+busybox-traceroute.9e31dd93c49cdaf1b1f790ac9c239416eda161f7d490396e20a8ba9ae5ec2a32
+#+busybox-wget.de65dcd0ec694fef2b2c07bdf6b51d9484b430c530c3e623fd0fff52e74958bd
+#+busybox-chpst.a19eaea5ed12b52edd75d19e0763620cd270e1ceb5fef8e6e9c1765168f2fe7b
+#+busybox-console.79352d3309e1e7dfeb24fbcd8956dc6cf3b9c23e9ece109f6a4cbac919b92591
+#+busybox-getty.1791449c1d99a4ee572a5ddd57ac3fcc3e8c4593804976b9663575cf6871b99d
+#+busybox-i2c-tools.66ae66934a247584026f37de1c429a8be62e358fb317e5ee147c4fceb9af6b9a
+#+busybox-linux-extra.05dec34d509f2a1671476b688698ec4e8e17563eb00d285c3d503ff9f51d1093
+#+busybox-mtd-utils.5826d408718370190016afa013edca8c81034707cde5536be4bbd8426d21567a
+#+busybox-shadow.f5b7cf0f03538138d1f5dbd6694b78297772d7bf32363790f68f2ff0615f8614
+#+busybox-su.652914863fee2139a05a3dfe59f0e205d709b21c6f5ca8ca34a4c8228bdea37d
+#+busybox-util-linux-priv.fd12c7a4ecd3a52322f581a81c18e32538fcf4e9476f62e199c5be6aaa62a364
+#+busybox-logging.fb0dc0a85162f29b38305648d4581c8d92ea25185c5b00bc27617d5510caa258
+#+busybox-cron.1453cfec74ec2315a450ea3bf4ae8f524b5ab76b191a536a2bee4553f527b3c8
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+nawk.fffd06b71160c3ac0063c67529276c6483b1906cf5823d690569e4225cfdaa06
+#+diffutils.d2f4ec34328287b5d8663726c2a48e2868a5189cbf25b6513b7405e5d3b8838f
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+aat.7312065d71e0070ab3e882c83b3dba48a9a24acd17d614a9b2ba6dff44ea0443
+#+fileset.6857d8af5195a378716bc0351dfe38c9791de0cf3f5c10864c3e7c2e812ed040
+#+rsync.e5d4421bddb123de8f26c62ef3f7b4e422db2d44ef09c9244cc4832aab83cead
+#+execline.f071229a774a18a54adce907ed0762c0bb4cae080e0bc616fd07d69355331e91
+#+kbd.3f7dc7d5e735d8664e98d19e8258b718991748862ac7f74ae54a5e3bcb764767
+#+mdevd.1725680ab36d5a98d9011bd4e0f438544c8d0a473b79b4c37f8bb582a1c082ba
+#+s6-linux-utils.e717644568e8974056f2ca464844675295128271669af74b989b1f1bf70fa7df
+#+s6-rc.53203c1ccf39b1851bfdb0ab5cb2d0ae97424549d87979912b1f576bd37aaca4
+#+s6.a052ec72e8699f44f9d85f9130603aaa135e809769002c6cb94c5b7d4e0a224c
+#+zsh.253499e46e90e47c8bf3342e6fe39cabf18532fc150b6da2ce0418aef3287c67
+#+libcgroup.5ecfaf06e2b6627c68f8a561640358413cfe35320bae14220ad07e5815da46d8
+#+system-config-scripts.6dad043d03e2dad3b55934efc34d8f23966d26196466f3aefdb980ad001e48a7
+#+logincaps.5dbf75f35938f9032e273d5f2a0c90bd4a87f8e970de3fe6e61425f74a78941e
+#+busybox-modutils.3788285ad89fc6ffafdd57cd4e9506d19e53263b740837d6230d893e52d19838
 #@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.a7f800255141414a2da55bd6359d9cd333771409835c08ccf99e56573c073adc' \
-	'pthbs_path_mdevd=/versions/env.69eaa0ebad56c4cd29878d41e68cbbd937ab1a17dd343906fe81a3909c30b9b5' \
+	'pthbs_path_containers=/versions/env.5bfd578f1905209fd828ab4922226bc4cfdb178ebdd578e56ce58189803da4f5' \
+	'pthbs_path_mdevd=/versions/env.faa6d9f5c530008ac3818d0d0d31fd534b7cace594ca0255b48500883eb743fe' \
 	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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-dosfstools.3ff39c63382b6b03a08e8537f83ed369d79164639a6de6a2b4d1295fdebac6ae
-#+busybox-e2fsprogs.31a5c9c96125f6799ba7866d653ae89f06a87e663f9b31438bc39b79acbed359
-#+busybox-iproute2.072dcebb6cd720f7152743ab12ad17d518dc1e28fd7b7309761da8be4935099f
-#+busybox-iputils.7c10dd88e641b57ca5dfcacc0cbc9210502dff5a6e41fabd672f10a72b132285
-#+busybox-net-misc.54f5b29e415face0c32ad0665d64f13480ac484b2d7886ec49d7f121d53ae125
-#+busybox-net-tools.295483b75ff13c99324fd37b31b59a3e1165ee833f64f806d97543d9b18f7604
-#+busybox-traceroute.6c64ac9fe49fb24f22ef7e18d7c875352cd7827548dba0c744409578feb8a161
-#+busybox-wget.5e1571cf15bb996e12df92c313a1cb07525755889f47c3b946bff1230c319758
-#+busybox-chpst.24e924deb368b54bc6f9fe49299aa8711d9dd4ce5d85feba215154624097401e
-#+busybox-console.2b3cf0502e26d5b9fc80a40ace4e52c76d3859b91be4a2fb45850226e1eb0d45
-#+busybox-getty.d9ebe92822354e261decfccfb25186cbe2377287c23441585c8c9539d6ead732
-#+busybox-i2c-tools.2209c167c4edbc49f643883917d612dd9ca53d67e4e523d576ecf03b21eac1ac
-#+busybox-linux-extra.b2e2d3f8674b4b1cf73d748fd5cc54e98d083439436a522804864dd8b84416a5
-#+busybox-mtd-utils.3e2065e2c74963525536e038a1fc931b16974e098c2d5712b0efc5a6484011b6
-#+busybox-shadow.681f9ffa9dbc7744cb3b16e150296d365df8cefcb40b067742e934e8b4a7eeb1
-#+busybox-su.1d9e70cc1dff427b7df5e1a99ec64a1d59dd1c9b61fba3c5d2d4c1059d6f946b
-#+busybox-util-linux-priv.76728340753177c7161f5146097db31497888855d4f4006937148eff28985418
-#+busybox-logging.b24acbeb998f38d492fa072de773459bfe02f3907337dd62b4349c7dc3668b9c
-#+busybox-cron.128d5e0df464faf29ad16c32ad983361c2c9d242c036cdaa7e0dc0870073e47f
-#+s6.b466f661193b05290d00f1047805079f131653fa545378c427caf96ba2413129
-#+s6-rc.911b7518a2721bc13cba9a597e0e058ed8aa402fe68e8d88b94e62c3c2a59712
-#+s6-portable-utils.9b10b212f3dca4bb14bed9ae820e0f0ca3322f774387dc03762bd2f9481a18bd
-#+s6-linux-init.a60b7996e32b839c5ba1d958a5e68634653ea646c5d930f44b29e92a60f24ffc
-#+execline.b5cddad4acb4764712c5b11b272a74b1dfeea5ff1b0aa56e2b2e24102e26f8fc
-#+system-config-rc.def887e8659c83e41c03f9303b77ba24772084f54f1b4fbbbf9c053ad4f8e02e
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-dosfstools.7fc1a0ab553cc02e7ee18eed4e8315fe490e6dd8bbc5ca2e7837b530d055d3fd
+#+busybox-e2fsprogs.56e3ce469476cd9bc42cde64b731921a18353f354d970b071c4acebcb8478f75
+#+busybox-iproute2.0601716fc4401a2290eb2041743098400253853932da5d34d1f1e31d7d858364
+#+busybox-iputils.3b8da87d82a0f83c0387730d4f98c77688eff37abd170b4be411657fc1680dd1
+#+busybox-net-misc.14697e6f6b73b6905a116326b8ad414a0581c90648ba502a9db94052e916eeaa
+#+busybox-net-tools.494716813146ea60c7b3ff18784483abc202084691262f996ff973add3fa31b1
+#+busybox-traceroute.9e31dd93c49cdaf1b1f790ac9c239416eda161f7d490396e20a8ba9ae5ec2a32
+#+busybox-wget.de65dcd0ec694fef2b2c07bdf6b51d9484b430c530c3e623fd0fff52e74958bd
+#+busybox-chpst.a19eaea5ed12b52edd75d19e0763620cd270e1ceb5fef8e6e9c1765168f2fe7b
+#+busybox-console.79352d3309e1e7dfeb24fbcd8956dc6cf3b9c23e9ece109f6a4cbac919b92591
+#+busybox-getty.1791449c1d99a4ee572a5ddd57ac3fcc3e8c4593804976b9663575cf6871b99d
+#+busybox-i2c-tools.66ae66934a247584026f37de1c429a8be62e358fb317e5ee147c4fceb9af6b9a
+#+busybox-linux-extra.05dec34d509f2a1671476b688698ec4e8e17563eb00d285c3d503ff9f51d1093
+#+busybox-mtd-utils.5826d408718370190016afa013edca8c81034707cde5536be4bbd8426d21567a
+#+busybox-shadow.f5b7cf0f03538138d1f5dbd6694b78297772d7bf32363790f68f2ff0615f8614
+#+busybox-su.652914863fee2139a05a3dfe59f0e205d709b21c6f5ca8ca34a4c8228bdea37d
+#+busybox-util-linux-priv.fd12c7a4ecd3a52322f581a81c18e32538fcf4e9476f62e199c5be6aaa62a364
+#+busybox-logging.fb0dc0a85162f29b38305648d4581c8d92ea25185c5b00bc27617d5510caa258
+#+busybox-cron.1453cfec74ec2315a450ea3bf4ae8f524b5ab76b191a536a2bee4553f527b3c8
+#+s6.a052ec72e8699f44f9d85f9130603aaa135e809769002c6cb94c5b7d4e0a224c
+#+s6-rc.53203c1ccf39b1851bfdb0ab5cb2d0ae97424549d87979912b1f576bd37aaca4
+#+s6-portable-utils.cb4070f9ea15611f849c0a1ade070f2a12050d25933c65af39a58c80accd6b4c
+#+s6-linux-init.baf4fde29e0cd55060eff75e1534e6c2051ada04a8894bba141e6d02f410ec9f
+#+execline.f071229a774a18a54adce907ed0762c0bb4cae080e0bc616fd07d69355331e91
+#+system-config-rc.c9c25399f3f55c33f803116e407a0c3efe752973cf5c0ca1da29317925c3215a
 
 
 # - build script start -
@@ -76,7 +76,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-s6rcdb=/versions/system-config-rc.def887e8659c83e41c03f9303b77ba24772084f54f1b4fbbbf9c053ad4f8e02e/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.c9c25399f3f55c33f803116e407a0c3efe752973cf5c0ca1da29317925c3215a/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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+s6-rc.911b7518a2721bc13cba9a597e0e058ed8aa402fe68e8d88b94e62c3c2a59712
-#+fileset.b52f41c7eb15fbdc28d66d3559134ac5c2a57a57bfc60ab2b3a05def8cfe55a0
-#+system-config.affaf469483c2dc9819d70bc0507073bb27c03943fdf2471529cb39cd36fe0a5
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+s6-rc.53203c1ccf39b1851bfdb0ab5cb2d0ae97424549d87979912b1f576bd37aaca4
+#+fileset.6857d8af5195a378716bc0351dfe38c9791de0cf3f5c10864c3e7c2e812ed040
+#+system-config.ca7b0e5293fcdd04cb72756333c079204f9153929afc0ef5003fc08a22778654
 
 
 # - build script start -
@@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-src=/versions/system-config.affaf469483c2dc9819d70bc0507073bb27c03943fdf2471529cb39cd36fe0a5/config/s6-rc-source
+src=/versions/system-config.ca7b0e5293fcdd04cb72756333c079204f9153929afc0ef5003fc08a22778654/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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+zsh.491fef7a15462a76f8cb84640d3127c4654aacebd87064bd3e486e81c5b8f397
-#+pthbs-banginstall.d123c717dcdbde6e3fca02bfe008b86639549ef95fa48b303ee0a31b778e6a79
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+zsh.253499e46e90e47c8bf3342e6fe39cabf18532fc150b6da2ce0418aef3287c67
+#+pthbs-banginstall.22166fce84053bfb8337f83bf61b27e7a839dcf642aa08b93ea3575b5b97fc37
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+zsh.491fef7a15462a76f8cb84640d3127c4654aacebd87064bd3e486e81c5b8f397
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+zsh.253499e46e90e47c8bf3342e6fe39cabf18532fc150b6da2ce0418aef3287c67
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
 #@untar:-z:sha256:f3ae622c765db4e0d791ea90a9feba39d7f693ef9cb949a797f7ad6b404a2d61:.
 
 
diff --git a/variants/root-x86_64/toolchain.environment b/variants/root-x86_64/toolchain.environment
@@ -0,0 +1,4 @@
+#!/usr/bin/env pthbs-build
+#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
+#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
+#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137+
\ No newline at end of file
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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+execline.b5cddad4acb4764712c5b11b272a74b1dfeea5ff1b0aa56e2b2e24102e26f8fc
-#+pthbs-banginstall.d123c717dcdbde6e3fca02bfe008b86639549ef95fa48b303ee0a31b778e6a79
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+execline.f071229a774a18a54adce907ed0762c0bb4cae080e0bc616fd07d69355331e91
+#+pthbs-banginstall.22166fce84053bfb8337f83bf61b27e7a839dcf642aa08b93ea3575b5b97fc37
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-dosfstools.3ff39c63382b6b03a08e8537f83ed369d79164639a6de6a2b4d1295fdebac6ae
-#+busybox-e2fsprogs.31a5c9c96125f6799ba7866d653ae89f06a87e663f9b31438bc39b79acbed359
-#+busybox-iproute2.072dcebb6cd720f7152743ab12ad17d518dc1e28fd7b7309761da8be4935099f
-#+busybox-iputils.7c10dd88e641b57ca5dfcacc0cbc9210502dff5a6e41fabd672f10a72b132285
-#+busybox-net-misc.54f5b29e415face0c32ad0665d64f13480ac484b2d7886ec49d7f121d53ae125
-#+busybox-net-tools.295483b75ff13c99324fd37b31b59a3e1165ee833f64f806d97543d9b18f7604
-#+busybox-traceroute.6c64ac9fe49fb24f22ef7e18d7c875352cd7827548dba0c744409578feb8a161
-#+busybox-wget.5e1571cf15bb996e12df92c313a1cb07525755889f47c3b946bff1230c319758
-#+busybox-chpst.24e924deb368b54bc6f9fe49299aa8711d9dd4ce5d85feba215154624097401e
-#+busybox-console.2b3cf0502e26d5b9fc80a40ace4e52c76d3859b91be4a2fb45850226e1eb0d45
-#+busybox-getty.d9ebe92822354e261decfccfb25186cbe2377287c23441585c8c9539d6ead732
-#+busybox-i2c-tools.2209c167c4edbc49f643883917d612dd9ca53d67e4e523d576ecf03b21eac1ac
-#+busybox-linux-extra.b2e2d3f8674b4b1cf73d748fd5cc54e98d083439436a522804864dd8b84416a5
-#+busybox-mtd-utils.3e2065e2c74963525536e038a1fc931b16974e098c2d5712b0efc5a6484011b6
-#+busybox-shadow.681f9ffa9dbc7744cb3b16e150296d365df8cefcb40b067742e934e8b4a7eeb1
-#+busybox-su.1d9e70cc1dff427b7df5e1a99ec64a1d59dd1c9b61fba3c5d2d4c1059d6f946b
-#+busybox-util-linux-priv.76728340753177c7161f5146097db31497888855d4f4006937148eff28985418
-#+busybox-logging.b24acbeb998f38d492fa072de773459bfe02f3907337dd62b4349c7dc3668b9c
-#+busybox-cron.128d5e0df464faf29ad16c32ad983361c2c9d242c036cdaa7e0dc0870073e47f
-#+attr.0357fac1aa91a57576599782b8e22d2f0d3247f1db90cb513f6052d47d3c7399
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+diffutils.dfd984d13bd34144fee458d165c7bdc84345c6fd89db7f8359f0c64bd0aab739
-#+patch.b094bff23ba91b83014fa4913272d726f6d454161c0eaf92e3034ff0bf41d4ed
-#+flex.7c2d2d543e2abf524bbdc174157583de0100e00f69dc915a562bcfe14624b0ed
-#+bison.689b0ac7f7a45d41f372049c7d98f890370e9be19479debe4382df77120ba3ff
-#+rsync.192dcf4c758c44a1345543b32ad13510c4edf04a9347f0a23a4ccbfb7af69464
-#+execline.b5cddad4acb4764712c5b11b272a74b1dfeea5ff1b0aa56e2b2e24102e26f8fc
-#+s6.b466f661193b05290d00f1047805079f131653fa545378c427caf96ba2413129
-#+s6-rc.911b7518a2721bc13cba9a597e0e058ed8aa402fe68e8d88b94e62c3c2a59712
-#+s6-portable-utils.9b10b212f3dca4bb14bed9ae820e0f0ca3322f774387dc03762bd2f9481a18bd
-#+s6-linux-utils.fe96f77725356d70a42b7d2b9b1aaa75adba6976db8658e154284b029f228355
-#+s6-linux-init.a60b7996e32b839c5ba1d958a5e68634653ea646c5d930f44b29e92a60f24ffc
-#+mdevd.e603d4269e76fdb6d56104c36bf95b4b0256506029941fc4aa3276d9facb0826
-#+s6-dns.6cdfdfccc07560c084c9a29948d25bdb466bc0e6d3eab64fbf50334533cda59e
-#+libressl.b4bccfabdae12bd61d28f482e64cdc9789cc45698f4aa8a0108b01a667b06034
-#+s6-networking.c3b52fb60ed0cd09be6059b7b61eb24fd313eb6b0652db03a0e9725725642032
-#+zsh.491fef7a15462a76f8cb84640d3127c4654aacebd87064bd3e486e81c5b8f397
-#+pthbs-banginstall.d123c717dcdbde6e3fca02bfe008b86639549ef95fa48b303ee0a31b778e6a79
-#+aat.8037c298bd189ef350247ef00e3d3ad891c96a44c4af57a72b29d6f4ad9bd729
-#+confz.5fe890aa4a07b60ad1a7f980b540fbfe578f1d8011eca11e1b09ebd42f4a6c7a
-#+containers.9e8530637903c2677026474c605725d781f04c78535fc511ecb5c4404b66cd78
-#+fileset.b52f41c7eb15fbdc28d66d3559134ac5c2a57a57bfc60ab2b3a05def8cfe55a0
-#+logincaps.8df05ce6f79a7092d14ee5d4bb55245c726546babad3573827d47538b5b8b30a
-#+snaprep.c560614bbfd4996805dc8e32b33ecdae216acd63baa24de7cfce419480ef2c48
-#+curl.366c50c88ab69a3c9293853d4d640a51c0e70b676857166a96240b305b86a030
-#+git.d9085f2de6363e7c45bd083249b15942421c9b9f9bea077ba4a47b16e3a518a0
-#+xbps.664571ca5dbc5fc04f388c7b15c2d7805e273b801a04661a2cfe7cc8d96009c3
-#+apk-tools.fb7d75da937adec811e132ca2735b174856ab242fafebd2fdd5d3f52f43c0057
-#+getent.5e10b06164b3a2f32b0696e2c2801f44deb2e917f351bfcfecbb4ed3ef6a8e1f
-#+getconf.0968844b268686a1c17deef82461673aabaecc51795827bec19e2562fa288112
-#+iconv.44d8c72aaff73edbd6d7ebcc6a170cc0c3d5555150e6c36483d8d026171a0b1a
-#+libcap.746b05f72aa151abe54c9d50f8746b3d575c22b3206b4b2f665ae8ac42f01b56
-#+applyuidgid-caps.cd57a74587e8f6cd2ecfbe1f8a64089a6ff9aed7b53d2c94f233bff81bac3508
-#+ccx-utils.b6591c55ef25df5fd6c248a30b8fdee5346baa045c0244bfbaea4ada9990a737
-#+user-env.28d416dc379497ec1b10372f04214e5e96435b1c1e8bd5e0d93d8b7b2de1d25b
-#+strace.3e3cbc174d3fc26f9aca14555bcba4ac0734ef90c13439dd9bf8ea8e2d7247c3
-#+mlog.b8b5890d5b9b37ee62ed3c92b3091a4293ac082d131dc1fdcdb37cdb63d18897
-#+findutils.4d6e77521c4951d5a3de1bd7cd77eecb08776141d5c4aa7c6ea524ffbe867e9c
-#+nawk.3a9c93692a78bb3c37d0ad5e2b0631bb738f46b7865b7b565e27d48b1efb4f2a
-#+nvi.15e767e8b7dda8aef4bb0ef32f52fbd81f57a3534de16b005f91afbb4cf71b99
-#+squashfs-tools.e33b0399fcdc8323f1035c036381653edd484e11451450f42cd8d71f1668b5b9
-#+mandoc.542c2519f60c6f49b41ebec560d13202719a1e58df2905757f9a88b9e0f69781
-#+tinyssh.8f3d65a4390e9a661e7783f6423a43d1b4b6239b7e7f28f6362b91da6dab0d9d-
\ No newline at end of file
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-dosfstools.7fc1a0ab553cc02e7ee18eed4e8315fe490e6dd8bbc5ca2e7837b530d055d3fd
+#+busybox-e2fsprogs.56e3ce469476cd9bc42cde64b731921a18353f354d970b071c4acebcb8478f75
+#+busybox-iproute2.0601716fc4401a2290eb2041743098400253853932da5d34d1f1e31d7d858364
+#+busybox-iputils.3b8da87d82a0f83c0387730d4f98c77688eff37abd170b4be411657fc1680dd1
+#+busybox-net-misc.14697e6f6b73b6905a116326b8ad414a0581c90648ba502a9db94052e916eeaa
+#+busybox-net-tools.494716813146ea60c7b3ff18784483abc202084691262f996ff973add3fa31b1
+#+busybox-traceroute.9e31dd93c49cdaf1b1f790ac9c239416eda161f7d490396e20a8ba9ae5ec2a32
+#+busybox-wget.de65dcd0ec694fef2b2c07bdf6b51d9484b430c530c3e623fd0fff52e74958bd
+#+busybox-chpst.a19eaea5ed12b52edd75d19e0763620cd270e1ceb5fef8e6e9c1765168f2fe7b
+#+busybox-console.79352d3309e1e7dfeb24fbcd8956dc6cf3b9c23e9ece109f6a4cbac919b92591
+#+busybox-getty.1791449c1d99a4ee572a5ddd57ac3fcc3e8c4593804976b9663575cf6871b99d
+#+busybox-i2c-tools.66ae66934a247584026f37de1c429a8be62e358fb317e5ee147c4fceb9af6b9a
+#+busybox-linux-extra.05dec34d509f2a1671476b688698ec4e8e17563eb00d285c3d503ff9f51d1093
+#+busybox-mtd-utils.5826d408718370190016afa013edca8c81034707cde5536be4bbd8426d21567a
+#+busybox-shadow.f5b7cf0f03538138d1f5dbd6694b78297772d7bf32363790f68f2ff0615f8614
+#+busybox-su.652914863fee2139a05a3dfe59f0e205d709b21c6f5ca8ca34a4c8228bdea37d
+#+busybox-util-linux-priv.fd12c7a4ecd3a52322f581a81c18e32538fcf4e9476f62e199c5be6aaa62a364
+#+busybox-logging.fb0dc0a85162f29b38305648d4581c8d92ea25185c5b00bc27617d5510caa258
+#+busybox-cron.1453cfec74ec2315a450ea3bf4ae8f524b5ab76b191a536a2bee4553f527b3c8
+#+attr.9ffe382c581a8af0378ee487d80218a4b7bf4568b7766779df2779dfb8f13486
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+diffutils.d2f4ec34328287b5d8663726c2a48e2868a5189cbf25b6513b7405e5d3b8838f
+#+patch.8e0c7cb577376dc28779fc98e3fca226002f90fbd8f71a592926d4f92023afab
+#+flex.6cd3baf9c0d9c22fca00e961aef92d0f435cc95be91ddd284a9b670549b4ad38
+#+bison.27c5b7956c7426266ddcc95f419638546fac55e2271d2f5f10a0bde2a90803ee
+#+rsync.e5d4421bddb123de8f26c62ef3f7b4e422db2d44ef09c9244cc4832aab83cead
+#+execline.f071229a774a18a54adce907ed0762c0bb4cae080e0bc616fd07d69355331e91
+#+s6.a052ec72e8699f44f9d85f9130603aaa135e809769002c6cb94c5b7d4e0a224c
+#+s6-rc.53203c1ccf39b1851bfdb0ab5cb2d0ae97424549d87979912b1f576bd37aaca4
+#+s6-portable-utils.cb4070f9ea15611f849c0a1ade070f2a12050d25933c65af39a58c80accd6b4c
+#+s6-linux-utils.e717644568e8974056f2ca464844675295128271669af74b989b1f1bf70fa7df
+#+s6-linux-init.baf4fde29e0cd55060eff75e1534e6c2051ada04a8894bba141e6d02f410ec9f
+#+mdevd.1725680ab36d5a98d9011bd4e0f438544c8d0a473b79b4c37f8bb582a1c082ba
+#+s6-dns.ae463f4376e39aa473759b65643e39340158941ed7e485993f8b5f2515db816b
+#+libressl.cfc609041b4eb1c994e2429d12fd2f73dff8ce206109924ff014850f1c4f40e3
+#+s6-networking.a9458d1240160094822940e4b105191cef43973bcf43628c618e7d1a75749f6a
+#+zsh.253499e46e90e47c8bf3342e6fe39cabf18532fc150b6da2ce0418aef3287c67
+#+pthbs-banginstall.22166fce84053bfb8337f83bf61b27e7a839dcf642aa08b93ea3575b5b97fc37
+#+aat.7312065d71e0070ab3e882c83b3dba48a9a24acd17d614a9b2ba6dff44ea0443
+#+confz.a11466c051e88e0e9b67dcc79997f447ac397743997955b6ffe4f02e791e2531
+#+containers.ce83852822f997559fa49a27398ee874c0383ba4f0011c53aa756b0b3664ed3c
+#+fileset.6857d8af5195a378716bc0351dfe38c9791de0cf3f5c10864c3e7c2e812ed040
+#+logincaps.5dbf75f35938f9032e273d5f2a0c90bd4a87f8e970de3fe6e61425f74a78941e
+#+snaprep.19b7bfc3dfbdea292d8513bbb499acf983889185c6f0b8822e8395592abe870a
+#+curl.f21147559df42812a077e63a0d7ee3bf6690843161772c713e627b888b6891dc
+#+git.307f7fca123437b9ef3eb94bff93d36e5600479360c78875d752902db8df0aff
+#+xbps.427509eccd090be5e27482fcf0ea74c320da5cbfab30b56323664ed25a41f5de
+#+apk-tools.d32636238c6ed739b4bd3afcdfaef242d1a24633ff8c61d8aa43bb180db1c01a
+#+getent.c1c9851495aba4fc78015a48c86f22cc0e4f0548fa464bdb05381cbbe5d32de7
+#+getconf.2ed3e178cc3f676e38c4d9424e3a351490a50c954fbc573f31752ab97a2d1b64
+#+iconv.7f2d71e74197e9d0500528adefae332fbec1f9c63393b4061557413d984c2ee1
+#+libcap.816074859b54c507a8120c3a4a870e10fd80ea89831f2b01dbcc596ddc542c61
+#+applyuidgid-caps.3336180df48d6afa771620d9475c4487369015603905e3290c4bb46ecace0867
+#+ccx-utils.a9eebb627ba2e78fbe913c7478cc3a2ed4feb69c4f29c400e2912262f11d8371
+#+user-env.c6ea0b61a6428362fd8bab26f37e4fbc3c179e13897575306f35557e1bb12c91
+#+strace.470a59dcfb504a4fb4ff7416c5058f602cf898fb0644745df61757993ed5e522
+#+mlog.fb71d342cec0bcaf754b302512976b04ed54e66413c7536cf0ade67ee3622d17
+#+findutils.7b98184f51dcab852378e9907940903bce7bec9071c87a096f36e27db20ed564
+#+nawk.fffd06b71160c3ac0063c67529276c6483b1906cf5823d690569e4225cfdaa06
+#+nvi.d1c76613348533bfeca98c349ebef5bbc224145379fd24fab429d3560a7f1845
+#+squashfs-tools.10496143dc037f2faabb460d8e37c62350ab33487eccbc27bbace7f4444dd5f8
+#+mandoc.9ff21e8446bf3e4d9fcebc1c7676b3e06b7226137663ad88e15e5c22f5f02d20
+#+tinyssh.a6ebad48b9ccec0499a11395cf302fb797d01f471b8b35ebbbaabe82abb1fe21+
\ 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.0c5c66c02cb1e8a3b2aad8545f2c5b3d4efba3ab72264e44bb8f60cf52146307-
\ No newline at end of file
+#+linux-qemu-guest.67b48bc5402a36f288b309953e9a673248b6eab3d5ca42e3c9763815fe0965ac+
\ 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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+libarchive.b243d284fbcb8002ba6ec308d37485c456bce7deff72e14462136073be0aa4b4
-#+libressl.b4bccfabdae12bd61d28f482e64cdc9789cc45698f4aa8a0108b01a667b06034
-#+pkgconf-pkg-config.d629fe0658f1e8f1ab46f13600c9a6801bea74c41fa457e2cb69b00f98f13c8b
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+libarchive.8473c7488bf8cf7064a4ad1c0c9f7385493aef253bfc8018849ca929eca61edf
+#+libressl.cfc609041b4eb1c994e2429d12fd2f73dff8ce206109924ff014850f1c4f40e3
+#+pkgconf-pkg-config.660b67bb60a770fe6a8b683681d667691eb85f0c8f5690b9fc813daefb723bfb
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+m4.6849dbf93ae1e108ae2029f7ced6c362830a26043691660f27adc424742fa16a
-#+netbsd-curses.2696ee31c0f10cee8e7726ec9a05bca70b1bb8037358302a1cf9318d8454a027
-#+libbsd.707646a5e8919e38fda77c12c06c0f4a71204419aa7f9955bdeab621bfcc3309
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+m4.993015f9bbec4bb286bd6ca07fef1e92776574dd009b502a0694e022314804cf
+#+netbsd-curses.20c8557bc5088f3ad2eefe900ba68e7a857704086ef24222818aaf2dae01f8f2
+#+libbsd.ccc46733d80bfd5d9b0c2569d08658afd997d9f33b6846ed52d47e10351f932f
 #@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.cc99d1f16d7207b1f7746cb4d08886da871130cc820a27c9549071d04e52b819
-#+busybox-bzip2.535f3b4ee46579e6dea62d2db395e72db64fe17a90e421d9b89cba75e6c81fc5
-#+busybox-gzip.47a720a98791df4072a14186322943a6c6a1e9b9600ffde9a4b4e8b9db5b56fb
-#+busybox-lzop.fa25f7a74270fab1e6e6649deb3a693a65eddf72014f8331954fe88e1c2ba820
-#+busybox-unzip.46241f0f41ac8736777e31ceef69d2053f785fbd5668a40c758c693aacaee2c4
-#+busybox-xz.09c878878fb4d33d70b0c26d499dbd5d3a6a11b8b701bf2ffcd90408d38324c9
-#+busybox-cpio.e6266b70c49d34cc1f8da5a5ed247dc06373fb5e324af9655e745b6c2da4df31
-#+busybox-dpkg.4e9c04f53ac621a5808fa52b28ce6b8f55af79748e1589779b76e5d2cc2eacd1
-#+busybox-rpm.b33b37151b57b7f415c02f28f0a37b6e292238bb04f27591de59398081bdc6d7
-#+busybox-tar.156d66e2583f8209bdd14bdfc468d15580bd89ddbede9712bd5500563d9fa2a0
-#+busybox-ed.e559107cc223e597d80f0c93578621dc69791594fb1213475d9e4520194e4e20
-#+busybox-sed.9376cb01daadb55eff4ee9c1e7f460ef36b449cce6cb98d7e45879dd22ddef0e
-#+busybox-vi.bb0f63346c85b73d7b34fe7fc0868c6b7d4ec75a73178fcf1d0b69074c7916df
-#+busybox-xxd.3ee710b8a030848f7e8ab870fff48600a17b378840c1311a9f32c8e8ec670ba8
-#+busybox-process-extra.9bba5eef7e256796f00ca761ca734e52ff44425205b2f0d490c98c3141964741
-#+busybox-procps.9d815ef716dfc0712cfd4dfa6e61d4bad5fa460a6c3be46721780906cbfcbcba
-#+busybox-psmisc.60b7da4324f499b9b23770f357630346c7cb6e0df413eee1343fb4b11e385057
-#+busybox-ash.79107f89c2849b103afd7d2ecfd30a2ef6dbd7450b750e496a510caccefbaceb
-#+busybox-bc.1e6de527210733f3b7842468bcd79883c1be8c97fbcdb645494e46bbb168c373
-#+busybox-coreutils.678a1179b33137ce4139cb70b8e7bfb48cd991867b358ef8c9ff7064590b86e3
-#+busybox-coreutils-extra.edd4cd872e51baff711983515006832e3df2359e0d00ae022ac15040694bdc4c
-#+busybox-daemontools.57e69b7736ad278859eda87eb8ebc7a2ccc089e74122dfa6f65a31046fc4c5c6
-#+busybox-grep.371c6947b1754323258c9bc8b33d01d819be2dbddf8ac3db4291f407a9b709e8
-#+busybox-misc.a53d5e55b81fafe292603d014b63757dab0942e03f28e8b8a49e974d6c20ac9e
-#+busybox-sh.e2b0de18bbf029acb6baf27aa9b21a606ff733b17e52acba5b39e768e3ffdbd3
-#+busybox-util-linux-unpriv.f4c6815dabab1642feaf1e5a98f6f375bf9a85f8c10d44a555b9af66bae780ed
-#+busybox-findutils.22b2e8a4f02fa25f8068ea3e4fa27351cdb11a8d36972ce3d84abf6ea7ff043a
-#+busybox-awk.af0129608b6cf6791471f6baa641bdb4fdd83496f23cc64e89d39dff0ae317c8
-#+musl.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
-#+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137
-#+gnu-make.7d5c1955ee736491d442185c452cf46816456c79fae7008abb0237bda0c1cd24
-#+busybox-diffutils.decf930ec042f586951e6c584a4dfa07e57ddaeb9365a2eeb7f2adbffafc10ad
+#+busybox.9c8feb7d7afd3a8ce0ebd2e8182af01b2a848ced5ef4fdd200e322b4b791a2de
+#+busybox-bzip2.df8f61be4454894e351a70e846602fd3dcf0b10ccaf2ab327e10d6a5226496f8
+#+busybox-gzip.b06d904baf368cb777e7ec8bbf78a9b9f8f0958072756a162689f80b85be19bd
+#+busybox-lzop.a70eeec270f3a01d3b3f44a917fc6d5f645f0be8e32de38435146b9217dfc663
+#+busybox-unzip.f67e8b317503078f9a7f5d2f18164190ca99f7da349b2ee69ab1e57b0d7eb3bc
+#+busybox-xz.be17e488985c75c074570ced06544d3c2fc4abe5a179c8e702a9439cf9271abc
+#+busybox-cpio.590a24cf96dde5fb7f3d0e9ee865219516d8811464188cbd43a8e76fa7274fd8
+#+busybox-dpkg.a89e9c9a876556d39c16fb4c99003b2218f8d05a5f930a73e0e33e34aa3d7a72
+#+busybox-rpm.d51d36c53508e69dceccd850abd88f5b0e5a1b95e3c454ab1fbb125b20ca8b08
+#+busybox-tar.d2d0f3d0418aa2703d26725711bec3c49cb686aa32c8c524ed37d65c245e19e4
+#+busybox-ed.4245a383cecfe5e8e33eac4ea087602c591d5cced1ba8bbc8a37511475976e23
+#+busybox-sed.f11ff8885924329ebce1b0c98dee0613d32cbb0376bb83f7d25ddd54521d7603
+#+busybox-vi.7411cb9abb698889fdba8262670c171fb0ce9470247aa539884d3e669dc1acb6
+#+busybox-xxd.0455488b2afc7d7f35476f50e0bfb23f39c3c635370b64b1a99a314885607e56
+#+busybox-process-extra.baecb0a682c731c5ce92a38639abb307a7ca5c41e2b0d8f9a2af8a21a2b893fd
+#+busybox-procps.af04d5ebb0084def170012ce7859c63efbb0ed84fd140e62f71a31d41a15d3a2
+#+busybox-psmisc.79a9ecde9330fdc653c82e50c812b1dd80de8981ed574ba66a6d29106a6ce35a
+#+busybox-ash.c1fa479bc9514f0c88fa6f015ba4290c481676ef5356e42d69eb73ba20182f00
+#+busybox-bc.c2e1995466d9ad2479260f5274494c581dd05936e13f2db7364c02b86ae620fe
+#+busybox-coreutils.e42def91bd7164be6b35c946be2242a942746585bce5819d9da4abd4ac14f9a4
+#+busybox-coreutils-extra.ddf0937ca42410ab20e01bdd0a578f9ce85e53e634dd63cf0f3d613f4ef7508b
+#+busybox-daemontools.716d583248d0959860a974bd7015a6021765785e22175cfdd7c8759eab4563c0
+#+busybox-grep.b76ce39775393805b3c61427bed248dcf0feef0e5b280c46bf41ef7787a64243
+#+busybox-misc.9dc13d4ecd9295461d45c299717bbd238d6f1fbaaa30f645c0fc964546fa185e
+#+busybox-sh.19ac5a7baadb9e5cf87c9aee6d89e8662cd7c63ec833884f26a13c0445d62265
+#+busybox-util-linux-unpriv.bf43778cdda27eaa87d0545b12f49c183f93464740edbff70e3036dbe60ce027
+#+busybox-findutils.41051859e8ea6707a2bb911df3997a403b53f5c71275db588c407e705c856438
+#+busybox-awk.9d4d67f0ad1bc84f8dbe5c85488dffc4caa30c5a137555a2ad1199f72cc4501a
+#+musl-cross-make.a22ac3706a13a8b04d4a6b015880911bb210f49b60dad4b3ccd9bab12713d548
+#+gnu-make.962a2b550297c595f87111af43190c3739b1acd1bc98c3675fc52003999041d4
+#+busybox-diffutils.211ee3e5afe3e9d05ae3c0b199ca2ca12fcf4e8e6e69a057ced6c7beeaffbeac
 #@untar:-z:sha256:98e9c3d949d1b924e28e01eccb7deed865eefebf25c2f21c702e5cd5b63b85e1:.

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