switch to m-c-m for final toolchain - mrrl - Minimal Reliable Reproducible Linux

commit e28e58c97829c13d846280c02a6a352a06f08870
parent cd8e34dcc0064db90a7dcfdda5b29c9425220944
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Tue,  9 Dec 2025 11:37:41 +0000

switch to m-c-m for final toolchain

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

320 files changed, 7416 insertions(+), 7764 deletions(-)
diff --git a/templates/package_sets b/templates/package_sets
@@ -19,12 +19,12 @@
 {%- endmacro %}
 
 {% macro toolchain() -%}
+#+{{pkg_install_name("musl-cross-make")}}
 {#-
-#+{{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/variants/ccx-x86_64/aat b/variants/ccx-x86_64/aat
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+zsh.d2764fd70ebf1801d5d5084f3d3fc2eb8269d4c69d47596310037304918e127d
-#+pthbs-banginstall.192aadfd6aae414a33837002940344bf81af86a4329001a17e87be11a1d08116
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+zsh.58b6fe827e616e7c5c8ee9509345ee8af3b6e554fc5eec3f4d2c0bd57a7271b7
+#+pthbs-banginstall.a9ddeb71ceb295a94adddbcc5a9594875e9cc23c46e641f52fc85f8612ea3dcc
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+patch.d6895a83538ac738fe9a3a55ecee3a4f402042e83fe879c82617239d1c80f7d9
-#+libressl.81c01c5ea3583a370cae043d1853fc630d0a5f4a86ade228a230cbb361854da8
-#+zstd.d886fd8ae8d85aebd691c3991d1087da3182efdf3e015aa27d07fa71f90db784
-#+pkgconf-pkg-config.4dbe0a0c4f26f5314d8ae812ef60a36d2712ab219cf7cfc640dc356f2244ab3a
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+patch.8ee00af0cdae80ff430fa442b6f606e9bd66d64d98e8b5df2e7853390abc00bb
+#+libressl.226bf1bb8a711bf00afe7d8c11d1336563883c8b64ddb7dcab7623935c9c6538
+#+zstd.da5b6acc2f12e7fbb362685c7a2e9d7face14f082a2391153e0dcac16e5a3468
+#+pkgconf-pkg-config.2fa2de99392a4945a4240fc66672dac11fc37e407f5cfe1fd17ad20a422ce220
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+skalibs.d88879a3104d67fecb16e3e34b138b31ecb0541c52e3fa5abe9d4e8754b5a7af
-#+libcap.bccc2cabad81a84e25a8475aa6ef01fe2f79237e52830993fa6ffc106ea49acf
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+skalibs.85f0e37448b5b26916386690418ec6dae49d77edc272ce43ef737238aa07b1b3
+#+libcap.fd034245ba020006eaef433e6fef35f06696e295b8b2d376f5b50a59612b568e
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+m4.39ec04fbe9090fa1c5e29e847ee230f5b2001ca4d2261611d885328f50b614cd
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+m4.d87becddb34bfcc9570a150218e9c04f0b11fda5a1947732878a514f7b9af268
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+m4.39ec04fbe9090fa1c5e29e847ee230f5b2001ca4d2261611d885328f50b614cd
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+m4.d87becddb34bfcc9570a150218e9c04f0b11fda5a1947732878a514f7b9af268
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
 #+nawk.e751b8be76a2fb59a2fe374e1f55c7da47b14ef1154eb8614d12107e6d68e88d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+m4.39ec04fbe9090fa1c5e29e847ee230f5b2001ca4d2261611d885328f50b614cd
-#+flex.a9f6eb6d5e24c3da9a05e60be21fa715c633b155e5d85fa3a900aa56820df946
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+m4.d87becddb34bfcc9570a150218e9c04f0b11fda5a1947732878a514f7b9af268
+#+flex.8f70fb4c6c01f3eb2e2d1c07f78c2a56fb7e69a4d078d5184e912ba9db1786d4
 #@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.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
 #+gnu-make.69bac45b9788ae51b55d84abdb050a1863403e3adb0ddd608036227a5202415e
 #+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
 #@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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
 
 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.b26c8d9933bd6ec4e66cfebc19dc46516218804b500835de8de55c00438d7899
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
+#+linux-qemu-guest.eca903c48f1434212764b1b251e81b5517500b4dea90099d0dd5ea562e1f56c8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
 #@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.b26c8d9933bd6ec4e66cfebc19dc46516218804b500835de8de55c00438d7899"
+CONFIG_DEFAULT_MODULES_DIR="/home/ccx/versions/linux-qemu-guest.eca903c48f1434212764b1b251e81b5517500b4dea90099d0dd5ea562e1f56c8"
 EOF
 make oldconfig
 cat .config
diff --git a/variants/ccx-x86_64/ca-certificates-wip-donotuse b/variants/ccx-x86_64/ca-certificates-wip-donotuse
@@ -1,33 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+certdata2pem.2504756bb8f7e0789fe62bfb3ab52fd485bf17aeb0af624ca0f7457bfc1d4893
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+certdata2pem.a56e83aaedce857044bcb51f6a92c9768837f52f57a93e9d25138d0867a0ffee
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+skalibs.d88879a3104d67fecb16e3e34b138b31ecb0541c52e3fa5abe9d4e8754b5a7af
-#+s6.d284978672757d1c9542ea1d387fadbe20e253d4437307f7efe9b22ce16f6e4b
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+skalibs.85f0e37448b5b26916386690418ec6dae49d77edc272ce43ef737238aa07b1b3
+#+s6.b18fdf1615dd798baa73249e1a7430663ff2f5f3d371c1e98c09e203b7343cac
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+zsh.d2764fd70ebf1801d5d5084f3d3fc2eb8269d4c69d47596310037304918e127d
-#+pthbs-banginstall.192aadfd6aae414a33837002940344bf81af86a4329001a17e87be11a1d08116
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+zsh.58b6fe827e616e7c5c8ee9509345ee8af3b6e554fc5eec3f4d2c0bd57a7271b7
+#+pthbs-banginstall.a9ddeb71ceb295a94adddbcc5a9594875e9cc23c46e641f52fc85f8612ea3dcc
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-dosfstools.4881ed447675fecf1e589a0400f5fb42f1ef5a0bf3b7ef7e28eb1da6874fbcee
-#+busybox-e2fsprogs.7fd0ff0183b391fe4e1621e2ad0bfcb354c7425e72b88b3aaa2ce68fbebaffb5
-#+busybox-iproute2.eaaadb05f1529fefcd64b92aeacb1aa5b1b86c07ad31abcf317158a07735d1b4
-#+busybox-iputils.f2a5f22050ba921a7aee8c0bd123679f07248981afcbe83f9c32b04a5d310625
-#+busybox-net-misc.7603404db30e398d2716f1403607ef85556df85a9f8d8bbcb824ab12a8a572fc
-#+busybox-net-tools.8c222eb2f4e6f465576895eba78d7c8629e0a121cc4b4430f456c809aea3f7cf
-#+busybox-traceroute.e3dd33df35bd2b5784cbd4d40fe4dd38390999f0f6282f99883b312d9f5b3fba
-#+busybox-wget.a8f2dc21a56b1075113f217f1db1b9f02f51566c25b7f0bc6fc945234b2128d0
-#+busybox-chpst.bbbe12e01a16717d83762f453bddcbdbf54a12e129bf5574c3e73a2bce3b1c88
-#+busybox-console.b1ddf4ff708c65cfbe98ddc690dc16281bd10ae41d7a75fa959a055e4a5cefc7
-#+busybox-getty.46a39138a7b81575eb2ee7c88deccebf23e9f53d838c69f6761efe67b27813e2
-#+busybox-i2c-tools.36e8d3e381586bb3af294c5d9541da6f3404ca054f0239ad82890724c7189737
-#+busybox-linux-extra.9ffb11b1231292badbf83632188cee56c283b8565cb36c368e66c3d98d891531
-#+busybox-mtd-utils.55d1ba4e18d3cde5c5655d90d32fb43c1bd264e42f0e1da512f96f315f66565e
-#+busybox-shadow.69d4684fa6895cd994f658bf77bdcd0a0955e086d71d91878690fff4f649f8e0
-#+busybox-su.cd3bd886424ef6010cfdd972cbba944d7247fad6b011849a3d85532cbda8f077
-#+busybox-util-linux-priv.bfb10fb79fd70805b05a98d8987ee0ef96128c5d8f54cd1881f0d2a9eb4ed62e
-#+busybox-logging.88c2f452824a4d909cae4bd6613bc56a3605f3d381b68d8f84fee66552b12e07
-#+busybox-cron.e47eef48b38ff283fc0b56357b0f5f52ccd21009cfe6f791c3cdabfdefbd70ce
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+busybox-login.e523396446bbaba274b6e3eca8e1b2c0426f9ab17acac58d08221a56aab79c44
-#+execline.ff3918dfab3546c8783f2b8c2b72dd8657aae669dd60c6db5ba0b2b45f6151e9
-#+s6.d284978672757d1c9542ea1d387fadbe20e253d4437307f7efe9b22ce16f6e4b
-#+ccx-utils.afef0584a482bc9ba120f3317abcd686c9e6a67db176ec542a40ea9cbe5fccea
-#+applyuidgid-caps.69831bf8d138a75a5672bbaf4c97a49b4c76e5b22d96cba681b9d701e42914d3
-#+easyseccomp.808b487aa178aa2a1dc0fafccb8e776cba682b41e28fd5815cf2934d0ec0fcab
-#+mlog.01e68df888274f1ab8eade5381555265409fe3a08012d75758ae4782bc3c509e
-#+abduco.fc74cd8fed955b184b1d828557fb87e213c54169d2a0a1f21e7d29abe0db2086
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-dosfstools.9bcc079e65c7f1b1e49032210544b028a5f5d0325a91088b69f19b5b46aca175
+#+busybox-e2fsprogs.69673574e2902bc3695e8690a1553393323957da06b8765d53228af9fa274141
+#+busybox-iproute2.515e135a0ea2255bb2ea2b6f90a78621e6d703bec0a3caecd45c2c130e7dd3b7
+#+busybox-iputils.b5e98392304bd1d69bbb4c28ed35be3a44e6d19fcd4cb86ac6f19580f6bcc94f
+#+busybox-net-misc.373b362033d0dc40ef0ced2744c81835fa801c2a2a708741d78c25faec826aac
+#+busybox-net-tools.9e6856c77d147a9cc17d51d5857d31df1ec95f9bd0a9afad0310b04e9e63f3e3
+#+busybox-traceroute.5ad375e78ece72608f0f3a42576a5c1a7157c4a9443c9506b7bc653b2ba6b336
+#+busybox-wget.a0d5a9eca1263a8a575f40e775f2e46f8b94eb3e9e87311facc55754f3457272
+#+busybox-chpst.36bd87104271b0b3d3ba1aad5870a48b6e61d2dc6eda39a73053f9ee0ff73523
+#+busybox-console.9aef149732c947a6e6b3d05184f7b4aeba980fc50f9e8ecada842e656ca2bbf4
+#+busybox-getty.6c7c7b0ba99603927efc9ab43f000e97d3831ef81fa0f34d6140edcd16ec2968
+#+busybox-i2c-tools.9b9ebc1fbc0618cc186e92a312b99fe583c86ba4c7f9a32a55a24b4e1f1839d2
+#+busybox-linux-extra.5afc0c0582f185d68dc1bf62a6a58158589b596604f29031b6f01d8d9297ba83
+#+busybox-mtd-utils.ca1ace238855cc587117a4c510a0a0a52c3f8b02e2164f379006153d9a317bc1
+#+busybox-shadow.5a02048f078a97d6fc6a8b986255c85a8fd740c68e00bbce8d6ffb2e309a447c
+#+busybox-su.4def7677fa294392c8447bbac9f58acf680a3c56ffd5f910362cc54550aa9a4c
+#+busybox-util-linux-priv.dac270757a016d86ba3867925477cd42220dbe5f5b58b0bd76c67d1c3f55a232
+#+busybox-logging.54bb0cc6957b9cd3cb4dfd27f43c5e6fd1ea8a14442166eb3b6d0ba6beaffd5a
+#+busybox-cron.fcd1f86a20e2691f6d86a6f5ac34056d0595d3b3dfe0fcfc6a60ecc482a7e972
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+busybox-login.b0d3695ff982bf8599f5387660c669caacae81b4937224ea69fe97498d6fa4c0
+#+execline.6c0015cfabf6f584cae445babbef047825036a6aeee8e8c6c871e72ffaec3dfd
+#+s6.b18fdf1615dd798baa73249e1a7430663ff2f5f3d371c1e98c09e203b7343cac
+#+ccx-utils.7223389a6f8e07e3b1608c8d4687188ea79249a7803a4077be0ba4a17de71ecf
+#+applyuidgid-caps.de46e709528c69185aacb856bd68328518b6cdb34b83b900547b44fd42e8cab9
+#+easyseccomp.991524a3aace633e057cd726f926b0a189c49933ddf8cfe5cbc6135dc2db38a9
+#+mlog.04beb73f9b725aee7a22c929b5ac1f4847c3e8ca527330b95b5019ec24eba150
+#+abduco.30c3102edd0ca1a5d5f75aded7444d65aa250745c2b8ae5e67fb9f074097db4c
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+zsh.d2764fd70ebf1801d5d5084f3d3fc2eb8269d4c69d47596310037304918e127d
-#+pthbs-banginstall.192aadfd6aae414a33837002940344bf81af86a4329001a17e87be11a1d08116
-#+execline.ff3918dfab3546c8783f2b8c2b72dd8657aae669dd60c6db5ba0b2b45f6151e9
-#+alpine-keys.492dfd516aeea3660d95b2739471405124f7f16e5e205ec11a90fd4ebb1ebcef
-#+apk-tools.59b5cfaa2bdd14ba3e5ca1399c56eeac3990de1f7792d8b5e53a6e9e188ba5f0
-#+xbps.4a0b5f265e5402c3801c05f283380d72f276da68d780ce780103d7d93cb18a7f
-#+container-bin-image.229ae4cfc6b3544621ee7ffc778242708db28c72c84f37d8ca56f05698a93b50
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+zsh.58b6fe827e616e7c5c8ee9509345ee8af3b6e554fc5eec3f4d2c0bd57a7271b7
+#+pthbs-banginstall.a9ddeb71ceb295a94adddbcc5a9594875e9cc23c46e641f52fc85f8612ea3dcc
+#+execline.6c0015cfabf6f584cae445babbef047825036a6aeee8e8c6c871e72ffaec3dfd
+#+alpine-keys.f6e27caa20fa8f5a19580d04fae8e0e6d279aa13a611f7177d3ba1e613063649
+#+apk-tools.6a1ed74bff7f1626e714d28a627438bcaa8dc1a54b770f5e6d96f8077d51be61
+#+xbps.4cea29f7454d39ea99f253e62bcd3d5de1ea7b55074796200c108fb47567bea1
+#+container-bin-image.19d08266679e26c28f69d6d64f6acf7ce26040527454b808553d2b0b94e312d3
 #@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.59b5cfaa2bdd14ba3e5ca1399c56eeac3990de1f7792d8b5e53a6e9e188ba5f0/command/apk.static' "${dest}/deps/command/"
-ln -sf '/home/ccx/versions/xbps.4a0b5f265e5402c3801c05f283380d72f276da68d780ce780103d7d93cb18a7f/command/xbps-install.static' "${dest}/deps/command/"
+ln -sf '/home/ccx/versions/apk-tools.6a1ed74bff7f1626e714d28a627438bcaa8dc1a54b770f5e6d96f8077d51be61/command/apk.static' "${dest}/deps/command/"
+ln -sf '/home/ccx/versions/xbps.4cea29f7454d39ea99f253e62bcd3d5de1ea7b55074796200c108fb47567bea1/command/xbps-install.static' "${dest}/deps/command/"
 
-for f in '/home/ccx/versions/alpine-keys.492dfd516aeea3660d95b2739471405124f7f16e5e205ec11a90fd4ebb1ebcef'/keys/alpine/*/*; do
+for f in '/home/ccx/versions/alpine-keys.f6e27caa20fa8f5a19580d04fae8e0e6d279aa13a611f7177d3ba1e613063649'/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.492dfd516aeea3660d95b2739471405124f7f16
 done
  
 mkdir -p "${dest}/deps/keys/void"
-for f in '/home/ccx/versions/xbps.4a0b5f265e5402c3801c05f283380d72f276da68d780ce780103d7d93cb18a7f'/keys/void/*; do
+for f in '/home/ccx/versions/xbps.4cea29f7454d39ea99f253e62bcd3d5de1ea7b55074796200c108fb47567bea1'/keys/void/*; do
 	ln -sf "$f" "${dest}/deps/keys/void/"
 done
 
-test -d '/home/ccx/versions/container-bin-image.229ae4cfc6b3544621ee7ffc778242708db28c72c84f37d8ca56f05698a93b50/container-bin-image'
-test -f '/home/ccx/versions/container-bin-image.229ae4cfc6b3544621ee7ffc778242708db28c72c84f37d8ca56f05698a93b50/container-bin-image/if'
-ln -sf '/home/ccx/versions/container-bin-image.229ae4cfc6b3544621ee7ffc778242708db28c72c84f37d8ca56f05698a93b50/container-bin-image' "${dest}/deps/"
+test -d '/home/ccx/versions/container-bin-image.19d08266679e26c28f69d6d64f6acf7ce26040527454b808553d2b0b94e312d3/container-bin-image'
+test -f '/home/ccx/versions/container-bin-image.19d08266679e26c28f69d6d64f6acf7ce26040527454b808553d2b0b94e312d3/container-bin-image/if'
+ln -sf '/home/ccx/versions/container-bin-image.19d08266679e26c28f69d6d64f6acf7ce26040527454b808553d2b0b94e312d3/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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-dosfstools.4881ed447675fecf1e589a0400f5fb42f1ef5a0bf3b7ef7e28eb1da6874fbcee
-#+busybox-e2fsprogs.7fd0ff0183b391fe4e1621e2ad0bfcb354c7425e72b88b3aaa2ce68fbebaffb5
-#+busybox-iproute2.eaaadb05f1529fefcd64b92aeacb1aa5b1b86c07ad31abcf317158a07735d1b4
-#+busybox-iputils.f2a5f22050ba921a7aee8c0bd123679f07248981afcbe83f9c32b04a5d310625
-#+busybox-net-misc.7603404db30e398d2716f1403607ef85556df85a9f8d8bbcb824ab12a8a572fc
-#+busybox-net-tools.8c222eb2f4e6f465576895eba78d7c8629e0a121cc4b4430f456c809aea3f7cf
-#+busybox-traceroute.e3dd33df35bd2b5784cbd4d40fe4dd38390999f0f6282f99883b312d9f5b3fba
-#+busybox-wget.a8f2dc21a56b1075113f217f1db1b9f02f51566c25b7f0bc6fc945234b2128d0
-#+busybox-chpst.bbbe12e01a16717d83762f453bddcbdbf54a12e129bf5574c3e73a2bce3b1c88
-#+busybox-console.b1ddf4ff708c65cfbe98ddc690dc16281bd10ae41d7a75fa959a055e4a5cefc7
-#+busybox-getty.46a39138a7b81575eb2ee7c88deccebf23e9f53d838c69f6761efe67b27813e2
-#+busybox-i2c-tools.36e8d3e381586bb3af294c5d9541da6f3404ca054f0239ad82890724c7189737
-#+busybox-linux-extra.9ffb11b1231292badbf83632188cee56c283b8565cb36c368e66c3d98d891531
-#+busybox-mtd-utils.55d1ba4e18d3cde5c5655d90d32fb43c1bd264e42f0e1da512f96f315f66565e
-#+busybox-shadow.69d4684fa6895cd994f658bf77bdcd0a0955e086d71d91878690fff4f649f8e0
-#+busybox-su.cd3bd886424ef6010cfdd972cbba944d7247fad6b011849a3d85532cbda8f077
-#+busybox-util-linux-priv.bfb10fb79fd70805b05a98d8987ee0ef96128c5d8f54cd1881f0d2a9eb4ed62e
-#+busybox-logging.88c2f452824a4d909cae4bd6613bc56a3605f3d381b68d8f84fee66552b12e07
-#+busybox-cron.e47eef48b38ff283fc0b56357b0f5f52ccd21009cfe6f791c3cdabfdefbd70ce
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+execline.ff3918dfab3546c8783f2b8c2b72dd8657aae669dd60c6db5ba0b2b45f6151e9
-#+s6.d284978672757d1c9542ea1d387fadbe20e253d4437307f7efe9b22ce16f6e4b
-#+s6-portable-utils.f53394f2cb8225037ed4849f4cf4f1cbb5fe6c72a984e71d18c850741c3e49af
-#+s6-linux-utils.a14648af37be9adfbe620ba60d6ebd87b5a4c7a5d0c5fd8704ab9772b7e92266
-#+zsh.d2764fd70ebf1801d5d5084f3d3fc2eb8269d4c69d47596310037304918e127d
-#+confz.9474186508db0bd608559481454a192045a6a1b82a803ba75cdcafa233d92ae7
-#+containers.0b81d0d62ff82e5a08329b824b00d2fe1091efe5a8f47645da1050ed055f32dc
-#+xbps.4a0b5f265e5402c3801c05f283380d72f276da68d780ce780103d7d93cb18a7f
-#+zstd.d886fd8ae8d85aebd691c3991d1087da3182efdf3e015aa27d07fa71f90db784
-#+apk-tools.59b5cfaa2bdd14ba3e5ca1399c56eeac3990de1f7792d8b5e53a6e9e188ba5f0
-#+alpine-keys.492dfd516aeea3660d95b2739471405124f7f16e5e205ec11a90fd4ebb1ebcef
-#+getent.50274bf559d10d64a9c6a48a4d164fb36d23325ae8632b000c9c26d37b5c002d
-#+fileset.8a55a9ddd70127190b4e062bbf11b69788a3f901700fe6eda4bd3e2dd293d576
-#+ccx-utils.afef0584a482bc9ba120f3317abcd686c9e6a67db176ec542a40ea9cbe5fccea
-#+easyseccomp.808b487aa178aa2a1dc0fafccb8e776cba682b41e28fd5815cf2934d0ec0fcab
-#+findutils.244f02771a878fd097df47f4bd62e8a93647b5998100c170da547c8b9fcb6906
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d-
\ No newline at end of file
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-dosfstools.9bcc079e65c7f1b1e49032210544b028a5f5d0325a91088b69f19b5b46aca175
+#+busybox-e2fsprogs.69673574e2902bc3695e8690a1553393323957da06b8765d53228af9fa274141
+#+busybox-iproute2.515e135a0ea2255bb2ea2b6f90a78621e6d703bec0a3caecd45c2c130e7dd3b7
+#+busybox-iputils.b5e98392304bd1d69bbb4c28ed35be3a44e6d19fcd4cb86ac6f19580f6bcc94f
+#+busybox-net-misc.373b362033d0dc40ef0ced2744c81835fa801c2a2a708741d78c25faec826aac
+#+busybox-net-tools.9e6856c77d147a9cc17d51d5857d31df1ec95f9bd0a9afad0310b04e9e63f3e3
+#+busybox-traceroute.5ad375e78ece72608f0f3a42576a5c1a7157c4a9443c9506b7bc653b2ba6b336
+#+busybox-wget.a0d5a9eca1263a8a575f40e775f2e46f8b94eb3e9e87311facc55754f3457272
+#+busybox-chpst.36bd87104271b0b3d3ba1aad5870a48b6e61d2dc6eda39a73053f9ee0ff73523
+#+busybox-console.9aef149732c947a6e6b3d05184f7b4aeba980fc50f9e8ecada842e656ca2bbf4
+#+busybox-getty.6c7c7b0ba99603927efc9ab43f000e97d3831ef81fa0f34d6140edcd16ec2968
+#+busybox-i2c-tools.9b9ebc1fbc0618cc186e92a312b99fe583c86ba4c7f9a32a55a24b4e1f1839d2
+#+busybox-linux-extra.5afc0c0582f185d68dc1bf62a6a58158589b596604f29031b6f01d8d9297ba83
+#+busybox-mtd-utils.ca1ace238855cc587117a4c510a0a0a52c3f8b02e2164f379006153d9a317bc1
+#+busybox-shadow.5a02048f078a97d6fc6a8b986255c85a8fd740c68e00bbce8d6ffb2e309a447c
+#+busybox-su.4def7677fa294392c8447bbac9f58acf680a3c56ffd5f910362cc54550aa9a4c
+#+busybox-util-linux-priv.dac270757a016d86ba3867925477cd42220dbe5f5b58b0bd76c67d1c3f55a232
+#+busybox-logging.54bb0cc6957b9cd3cb4dfd27f43c5e6fd1ea8a14442166eb3b6d0ba6beaffd5a
+#+busybox-cron.fcd1f86a20e2691f6d86a6f5ac34056d0595d3b3dfe0fcfc6a60ecc482a7e972
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+execline.6c0015cfabf6f584cae445babbef047825036a6aeee8e8c6c871e72ffaec3dfd
+#+s6.b18fdf1615dd798baa73249e1a7430663ff2f5f3d371c1e98c09e203b7343cac
+#+s6-portable-utils.a90109e5c7600970ca72af1335ca07aad6b1b044e3ddac48d91222471e08c2b5
+#+s6-linux-utils.2861ec0c9a2e6085aaebc07d20cb49c9c54c6511e7879c1d079d115c0198e35d
+#+zsh.58b6fe827e616e7c5c8ee9509345ee8af3b6e554fc5eec3f4d2c0bd57a7271b7
+#+confz.7932d526338a0c5e8572c6e42f9fba379903ac525746d4e9030039a1160d838e
+#+containers.ebcfae0cfe0c6ea61c6eb156e5de0936e179c0d8aa20d2806c292d3c06d5b5b4
+#+xbps.4cea29f7454d39ea99f253e62bcd3d5de1ea7b55074796200c108fb47567bea1
+#+zstd.da5b6acc2f12e7fbb362685c7a2e9d7face14f082a2391153e0dcac16e5a3468
+#+apk-tools.6a1ed74bff7f1626e714d28a627438bcaa8dc1a54b770f5e6d96f8077d51be61
+#+alpine-keys.f6e27caa20fa8f5a19580d04fae8e0e6d279aa13a611f7177d3ba1e613063649
+#+getent.1b1e736e986ade0b37cfc4b108106c19fdbb8029f95cb63e358dc30f233e4853
+#+fileset.6b3e7e2768e83fd75ab2b052cfab37dd0c1616d29331edd82018aa4800b36988
+#+ccx-utils.7223389a6f8e07e3b1608c8d4687188ea79249a7803a4077be0ba4a17de71ecf
+#+easyseccomp.991524a3aace633e057cd726f926b0a189c49933ddf8cfe5cbc6135dc2db38a9
+#+findutils.fb6a799f6323a2489070e91f41a409ba056a58d5e28ecfc72286befbb9d764ee
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7+
\ 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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+m4.39ec04fbe9090fa1c5e29e847ee230f5b2001ca4d2261611d885328f50b614cd
-#+libressl.81c01c5ea3583a370cae043d1853fc630d0a5f4a86ade228a230cbb361854da8
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+m4.d87becddb34bfcc9570a150218e9c04f0b11fda5a1947732878a514f7b9af268
+#+libressl.226bf1bb8a711bf00afe7d8c11d1336563883c8b64ddb7dcab7623935c9c6538
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-dosfstools.4881ed447675fecf1e589a0400f5fb42f1ef5a0bf3b7ef7e28eb1da6874fbcee
-#+busybox-e2fsprogs.7fd0ff0183b391fe4e1621e2ad0bfcb354c7425e72b88b3aaa2ce68fbebaffb5
-#+busybox-iproute2.eaaadb05f1529fefcd64b92aeacb1aa5b1b86c07ad31abcf317158a07735d1b4
-#+busybox-iputils.f2a5f22050ba921a7aee8c0bd123679f07248981afcbe83f9c32b04a5d310625
-#+busybox-net-misc.7603404db30e398d2716f1403607ef85556df85a9f8d8bbcb824ab12a8a572fc
-#+busybox-net-tools.8c222eb2f4e6f465576895eba78d7c8629e0a121cc4b4430f456c809aea3f7cf
-#+busybox-traceroute.e3dd33df35bd2b5784cbd4d40fe4dd38390999f0f6282f99883b312d9f5b3fba
-#+busybox-wget.a8f2dc21a56b1075113f217f1db1b9f02f51566c25b7f0bc6fc945234b2128d0
-#+busybox-chpst.bbbe12e01a16717d83762f453bddcbdbf54a12e129bf5574c3e73a2bce3b1c88
-#+busybox-console.b1ddf4ff708c65cfbe98ddc690dc16281bd10ae41d7a75fa959a055e4a5cefc7
-#+busybox-getty.46a39138a7b81575eb2ee7c88deccebf23e9f53d838c69f6761efe67b27813e2
-#+busybox-i2c-tools.36e8d3e381586bb3af294c5d9541da6f3404ca054f0239ad82890724c7189737
-#+busybox-linux-extra.9ffb11b1231292badbf83632188cee56c283b8565cb36c368e66c3d98d891531
-#+busybox-mtd-utils.55d1ba4e18d3cde5c5655d90d32fb43c1bd264e42f0e1da512f96f315f66565e
-#+busybox-shadow.69d4684fa6895cd994f658bf77bdcd0a0955e086d71d91878690fff4f649f8e0
-#+busybox-su.cd3bd886424ef6010cfdd972cbba944d7247fad6b011849a3d85532cbda8f077
-#+busybox-util-linux-priv.bfb10fb79fd70805b05a98d8987ee0ef96128c5d8f54cd1881f0d2a9eb4ed62e
-#+busybox-logging.88c2f452824a4d909cae4bd6613bc56a3605f3d381b68d8f84fee66552b12e07
-#+busybox-cron.e47eef48b38ff283fc0b56357b0f5f52ccd21009cfe6f791c3cdabfdefbd70ce
-#+attr.279b0fbf1c45d4ac37ec10291c74f6aeec3b2cc67947a4682c53f4483813021f
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+diffutils.d922124e66a108c5d2822ebc18a43cb935bcef0703a50972a438e3a40de524e1
-#+patch.d6895a83538ac738fe9a3a55ecee3a4f402042e83fe879c82617239d1c80f7d9
-#+flex.a9f6eb6d5e24c3da9a05e60be21fa715c633b155e5d85fa3a900aa56820df946
-#+bison.dc76ff144da72f38194aae27695b8b69c3a1a808473988d748c2d83573033f05
-#+rsync.6adcc2c2a251bec1bf073557cd0871c763ff1b19b5d46fd25c1a475fc186b84a
-#+execline.ff3918dfab3546c8783f2b8c2b72dd8657aae669dd60c6db5ba0b2b45f6151e9
-#+s6.d284978672757d1c9542ea1d387fadbe20e253d4437307f7efe9b22ce16f6e4b
-#+s6-rc.14ca43321a87060248bb6a856e153a28f24eea1bae4172bbf5eaa253a7163363
-#+s6-portable-utils.f53394f2cb8225037ed4849f4cf4f1cbb5fe6c72a984e71d18c850741c3e49af
-#+s6-linux-utils.a14648af37be9adfbe620ba60d6ebd87b5a4c7a5d0c5fd8704ab9772b7e92266
-#+s6-linux-init.766e495c215eaf1b63647fb37b377ccc3243441060f70f76a00b5b1f77f56e21
-#+mdevd.df56ed9fd9339f911d378c05701310bf1ce1b78199f91632d6b25e908a4655d1
-#+s6-dns.5d2a41c8398ac7e16dbeb6061d8b8328f9a309f2e308a52a40b963c8fc72f598
-#+libressl.81c01c5ea3583a370cae043d1853fc630d0a5f4a86ade228a230cbb361854da8
-#+s6-networking.5ad1df7af0204fd42c2efb4142897695371a81f06a732b5be7fe35230fdf053e
-#+zsh.d2764fd70ebf1801d5d5084f3d3fc2eb8269d4c69d47596310037304918e127d
-#+pthbs-banginstall.192aadfd6aae414a33837002940344bf81af86a4329001a17e87be11a1d08116
-#+aat.f6d4a205e6a4ea2cc2e095f84a8774780b4a4b42f5e6e79fe5b5b631e1e44d13
-#+confz.9474186508db0bd608559481454a192045a6a1b82a803ba75cdcafa233d92ae7
-#+containers.0b81d0d62ff82e5a08329b824b00d2fe1091efe5a8f47645da1050ed055f32dc
-#+fileset.8a55a9ddd70127190b4e062bbf11b69788a3f901700fe6eda4bd3e2dd293d576
-#+logincaps.17812fc8b5daa9a052f4b73d50bc0e7923d030165b5a1307b5af9264da0a74d9
-#+snaprep.7b9c88f05e8d693a9f4a737b2d1ec03330998707bf4fc40b7ae4089a7438e7a8
-#+curl.3d04a4674405d7f90f5b4cb8d7d0ce00cbfbb7f3bfb1247f24978e62da53c9e5
-#+git.a155d5d58fde21f9d348e6a0968da5a15e530b4fa6560c9d4498d507e89476f3
-#+xbps.4a0b5f265e5402c3801c05f283380d72f276da68d780ce780103d7d93cb18a7f
-#+apk-tools.59b5cfaa2bdd14ba3e5ca1399c56eeac3990de1f7792d8b5e53a6e9e188ba5f0
-#+getent.50274bf559d10d64a9c6a48a4d164fb36d23325ae8632b000c9c26d37b5c002d
-#+getconf.59dccb5ffd9845b7ce18241fbc754ae599aed1c62845e5befa1021efc2fd7469
-#+iconv.ae6d151f44744cd70e1deef24f2adb5a661db7dc7c955a0dd01e1dacf76d53a2
-#+libcap.bccc2cabad81a84e25a8475aa6ef01fe2f79237e52830993fa6ffc106ea49acf
-#+applyuidgid-caps.69831bf8d138a75a5672bbaf4c97a49b4c76e5b22d96cba681b9d701e42914d3
-#+ccx-utils.afef0584a482bc9ba120f3317abcd686c9e6a67db176ec542a40ea9cbe5fccea
-#+user-env.0fe6c7a053a79b4494ca6dd3d19838a3927a648d1552474d4fe62487eea541d8
-#+strace.0b940b8cb286451945a9bc6dad0304c43fdb336685f15623dff6f08da8a93769
-#+mlog.01e68df888274f1ab8eade5381555265409fe3a08012d75758ae4782bc3c509e
-#+findutils.244f02771a878fd097df47f4bd62e8a93647b5998100c170da547c8b9fcb6906
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+nvi.6730dce779d170ffbc22b702865f99531795b81a8afb3407ea8db0ab63a06c5e
-#+squashfs-tools.e3c33c1acddd8f41f61b7c7d7d4b83d112aee1c784f367be47ee5fb8b2996585
-#+mandoc.1b747ff7d11cfe44184e78a5c844a77bfd1c7d805431859eae9b350619efa1b6
-#+tinyssh.990e5f780a0a4113a8d53cddd2e23d9d12503816c0a7dcf9ee77bcff5c17efcd
-#+system-config.e0629e6e9db4b65946ebecbf27583b246cae3d41af9d9cef0512014b433f3796
-#+system-config-rc.41b2c9512cb4992b9f438fc5f983a3acf8b8dd339d5f06eb056302f08027364d
-#+system-config-scripts.65dec2086a4805e45d3144778b8b8dbb27e778599d39a85efab5a086090eb079
-#+system-config-init.06e290806311e903d8f594c05b1e66fbbb2589719e7a95282d8f38bb3f3b9009
-#+system-config-zsh.5a6e2214a15770e8c7b18fe54f8cf8963bec05f8500eacd893bb8c1bae690608
-#+busybox.f204029f319ffbfc8738117fd94b19ee001a7bcb8ec2ebfa69d607375b73c89e-
\ No newline at end of file
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-dosfstools.9bcc079e65c7f1b1e49032210544b028a5f5d0325a91088b69f19b5b46aca175
+#+busybox-e2fsprogs.69673574e2902bc3695e8690a1553393323957da06b8765d53228af9fa274141
+#+busybox-iproute2.515e135a0ea2255bb2ea2b6f90a78621e6d703bec0a3caecd45c2c130e7dd3b7
+#+busybox-iputils.b5e98392304bd1d69bbb4c28ed35be3a44e6d19fcd4cb86ac6f19580f6bcc94f
+#+busybox-net-misc.373b362033d0dc40ef0ced2744c81835fa801c2a2a708741d78c25faec826aac
+#+busybox-net-tools.9e6856c77d147a9cc17d51d5857d31df1ec95f9bd0a9afad0310b04e9e63f3e3
+#+busybox-traceroute.5ad375e78ece72608f0f3a42576a5c1a7157c4a9443c9506b7bc653b2ba6b336
+#+busybox-wget.a0d5a9eca1263a8a575f40e775f2e46f8b94eb3e9e87311facc55754f3457272
+#+busybox-chpst.36bd87104271b0b3d3ba1aad5870a48b6e61d2dc6eda39a73053f9ee0ff73523
+#+busybox-console.9aef149732c947a6e6b3d05184f7b4aeba980fc50f9e8ecada842e656ca2bbf4
+#+busybox-getty.6c7c7b0ba99603927efc9ab43f000e97d3831ef81fa0f34d6140edcd16ec2968
+#+busybox-i2c-tools.9b9ebc1fbc0618cc186e92a312b99fe583c86ba4c7f9a32a55a24b4e1f1839d2
+#+busybox-linux-extra.5afc0c0582f185d68dc1bf62a6a58158589b596604f29031b6f01d8d9297ba83
+#+busybox-mtd-utils.ca1ace238855cc587117a4c510a0a0a52c3f8b02e2164f379006153d9a317bc1
+#+busybox-shadow.5a02048f078a97d6fc6a8b986255c85a8fd740c68e00bbce8d6ffb2e309a447c
+#+busybox-su.4def7677fa294392c8447bbac9f58acf680a3c56ffd5f910362cc54550aa9a4c
+#+busybox-util-linux-priv.dac270757a016d86ba3867925477cd42220dbe5f5b58b0bd76c67d1c3f55a232
+#+busybox-logging.54bb0cc6957b9cd3cb4dfd27f43c5e6fd1ea8a14442166eb3b6d0ba6beaffd5a
+#+busybox-cron.fcd1f86a20e2691f6d86a6f5ac34056d0595d3b3dfe0fcfc6a60ecc482a7e972
+#+attr.306198f6fc35a1286e8d40bee2a2328ff7ddf4941d47cb2ee6d2267d25c6ec51
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+diffutils.fbef4cb98ee7f09f60875d80636eb6a7c2616a0846ac11a43e75f80f5bf8ddce
+#+patch.8ee00af0cdae80ff430fa442b6f606e9bd66d64d98e8b5df2e7853390abc00bb
+#+flex.8f70fb4c6c01f3eb2e2d1c07f78c2a56fb7e69a4d078d5184e912ba9db1786d4
+#+bison.58f4fe57003973b21d5743e84a688c26782f0ad153faac22979699be38f4219c
+#+rsync.8dd224dc919800927f50ed6096d089116ed25e56b693707735aca32cb7ceb602
+#+execline.6c0015cfabf6f584cae445babbef047825036a6aeee8e8c6c871e72ffaec3dfd
+#+s6.b18fdf1615dd798baa73249e1a7430663ff2f5f3d371c1e98c09e203b7343cac
+#+s6-rc.2fde1e944c3af08b844ab925bf7619557868e4b28a0eb75e9b65acd0a48d22e7
+#+s6-portable-utils.a90109e5c7600970ca72af1335ca07aad6b1b044e3ddac48d91222471e08c2b5
+#+s6-linux-utils.2861ec0c9a2e6085aaebc07d20cb49c9c54c6511e7879c1d079d115c0198e35d
+#+s6-linux-init.bb3502f93d9accf8f005706a6f09f6e9439e64ad2f73cc80a076ebe7dbe9b542
+#+mdevd.a460c5b630ce5aa87601319a6663a71e86d4cb3b8e7ee55b722574621ca5aaad
+#+s6-dns.494cf73b6ae89aa7e09ea7ba86f35284d02692e9cdb7b5c942caa5cdc1c31e70
+#+libressl.226bf1bb8a711bf00afe7d8c11d1336563883c8b64ddb7dcab7623935c9c6538
+#+s6-networking.5509be97bdfed8a90ccd322720b157f09c30f80114458b9539b3a9fa8234e153
+#+zsh.58b6fe827e616e7c5c8ee9509345ee8af3b6e554fc5eec3f4d2c0bd57a7271b7
+#+pthbs-banginstall.a9ddeb71ceb295a94adddbcc5a9594875e9cc23c46e641f52fc85f8612ea3dcc
+#+aat.7b99ea17519b070d75e112bf642178489362d4a7b765b264eb0d9bc07648c1ac
+#+confz.7932d526338a0c5e8572c6e42f9fba379903ac525746d4e9030039a1160d838e
+#+containers.ebcfae0cfe0c6ea61c6eb156e5de0936e179c0d8aa20d2806c292d3c06d5b5b4
+#+fileset.6b3e7e2768e83fd75ab2b052cfab37dd0c1616d29331edd82018aa4800b36988
+#+logincaps.9405204dd8fd882c77876c05e1d64b470765985f55b8c901b3e34efb74c2ada2
+#+snaprep.41c94b7d7a29c1d664f951c9b2718caf9083f5242772d3b3233ad37ac2ecf81e
+#+curl.55655ec26c265db43870c99c4706f480baca5926d2f45332ed473b006e897965
+#+git.e5319e4d799752e01a9fb98817312112dc1a6e0fe56ad028f4861d9098f5f33b
+#+xbps.4cea29f7454d39ea99f253e62bcd3d5de1ea7b55074796200c108fb47567bea1
+#+apk-tools.6a1ed74bff7f1626e714d28a627438bcaa8dc1a54b770f5e6d96f8077d51be61
+#+getent.1b1e736e986ade0b37cfc4b108106c19fdbb8029f95cb63e358dc30f233e4853
+#+getconf.bd17f5d96474cf19fc1dfc65f6e3a913ecdeec46703131e6dec3377a7e78031e
+#+iconv.1407950c4a70d1e7bdb3f962ba98c83357e745c9a77ce59a2711d3731fbf236b
+#+libcap.fd034245ba020006eaef433e6fef35f06696e295b8b2d376f5b50a59612b568e
+#+applyuidgid-caps.de46e709528c69185aacb856bd68328518b6cdb34b83b900547b44fd42e8cab9
+#+ccx-utils.7223389a6f8e07e3b1608c8d4687188ea79249a7803a4077be0ba4a17de71ecf
+#+user-env.8bf32bf6613fbac80d76b14eb92f9bd7a819c4d34b746d0c5c34d8e462d0488f
+#+strace.75af0b4d6432c56d79d535ff498ffa39a34e62df680d9175ac44a0fe55861386
+#+mlog.04beb73f9b725aee7a22c929b5ac1f4847c3e8ca527330b95b5019ec24eba150
+#+findutils.fb6a799f6323a2489070e91f41a409ba056a58d5e28ecfc72286befbb9d764ee
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+nvi.028c28637bf8469bc6c928a53383390ed3443667003bd739d56309ea971ce91a
+#+squashfs-tools.589b24925728e383b788486279b272a5b403e5cbb985da9c9a238fbbe977bcfc
+#+mandoc.2a930c58658fbe9a7c9b3c4212a70e13fb362b1158144884deaca64de8439141
+#+tinyssh.ad4b4f88f97fb974420ac16553bdc989cd88a8393c66d1427222ed09a61eb322
+#+system-config.98be5c89cd031856d94a74324c9b7d0631efc3ea951fa56b4176f46859730349
+#+system-config-rc.02aa6372cac8d7e3ce90243a627af0be92df6eb091be3c76e429ab5676c56637
+#+system-config-scripts.898b3816292c1d58f39c981940c2e52b0f3e938f25ed022a39414e87228ff266
+#+system-config-init.a7b4238221fbf2fc57ebbd7c269cbc308e636970a09fd5874baedf1ad29abffb
+#+system-config-zsh.9e38fce85569e2a2432666a18dfbf8015ca13100a26f195af1d80be1486bec4c
+#+busybox.fc88d714f5939b2f6f84c35d2d4dba2b0b69c7c4fa38e25c3423a9e2370df72d+
\ 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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+m4.39ec04fbe9090fa1c5e29e847ee230f5b2001ca4d2261611d885328f50b614cd
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+m4.d87becddb34bfcc9570a150218e9c04f0b11fda5a1947732878a514f7b9af268
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+ocaml.8c516d26ec593144e385acbd20047b1d9f8e395929b2bd8c19f0e21f5cbb2845
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+ocaml.dcc1b1f9d3951e24ea8d985579f24974ad22c275748e0bccf4718e897bdd933d
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+m4.39ec04fbe9090fa1c5e29e847ee230f5b2001ca4d2261611d885328f50b614cd
-#+patch.d6895a83538ac738fe9a3a55ecee3a4f402042e83fe879c82617239d1c80f7d9
-#+flex.a9f6eb6d5e24c3da9a05e60be21fa715c633b155e5d85fa3a900aa56820df946
-#+bison.dc76ff144da72f38194aae27695b8b69c3a1a808473988d748c2d83573033f05
-#+libseccomp.b6b9d71bd55d8a53794d71843e6fcf93714cd780dd3bf9081c8fc16aaa7b74a0
-#+error-standalone.a7dc32b0884bd1721314036f669ce2a48c36e3f2dc0a182a79c291d397a41aa6
-#+argp-standalone.d1683ee1b01def650a8a494df3146843c9672856097d95353dfb48f45352d1b8
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+m4.d87becddb34bfcc9570a150218e9c04f0b11fda5a1947732878a514f7b9af268
+#+patch.8ee00af0cdae80ff430fa442b6f606e9bd66d64d98e8b5df2e7853390abc00bb
+#+flex.8f70fb4c6c01f3eb2e2d1c07f78c2a56fb7e69a4d078d5184e912ba9db1786d4
+#+bison.58f4fe57003973b21d5743e84a688c26782f0ad153faac22979699be38f4219c
+#+libseccomp.6010ceaef6264034331033effc35ef2d1d7580c1aa240eaa8f8319e61ab74cad
+#+error-standalone.6e2361e5db885530bf3373e878ec274ac3a91b238d1f5f1538ca2f00d47b6b0e
+#+argp-standalone.78dc974325f5b346a6d1f093e58f8b47d7c8277343b922de30bbe360284654bf
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+skalibs.d88879a3104d67fecb16e3e34b138b31ecb0541c52e3fa5abe9d4e8754b5a7af
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+skalibs.85f0e37448b5b26916386690418ec6dae49d77edc272ce43ef737238aa07b1b3
 #@git:6c0957eb5e8eea2ffada4d7be08286f0e81d0527:execline
 
 
@@ -48,7 +46,7 @@ cd 'execline'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.d88879a3104d67fecb16e3e34b138b31ecb0541c52e3fa5abe9d4e8754b5a7af/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.85f0e37448b5b26916386690418ec6dae49d77edc272ce43ef737238aa07b1b3/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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+zsh.d2764fd70ebf1801d5d5084f3d3fc2eb8269d4c69d47596310037304918e127d
-#+pthbs-banginstall.192aadfd6aae414a33837002940344bf81af86a4329001a17e87be11a1d08116
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+zsh.58b6fe827e616e7c5c8ee9509345ee8af3b6e554fc5eec3f4d2c0bd57a7271b7
+#+pthbs-banginstall.a9ddeb71ceb295a94adddbcc5a9594875e9cc23c46e641f52fc85f8612ea3dcc
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+m4.39ec04fbe9090fa1c5e29e847ee230f5b2001ca4d2261611d885328f50b614cd
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+m4.d87becddb34bfcc9570a150218e9c04f0b11fda5a1947732878a514f7b9af268
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
 #+nawk.e751b8be76a2fb59a2fe374e1f55c7da47b14ef1154eb8614d12107e6d68e88d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+m4.39ec04fbe9090fa1c5e29e847ee230f5b2001ca4d2261611d885328f50b614cd
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+m4.d87becddb34bfcc9570a150218e9c04f0b11fda5a1947732878a514f7b9af268
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+m4.39ec04fbe9090fa1c5e29e847ee230f5b2001ca4d2261611d885328f50b614cd
-#+libressl.81c01c5ea3583a370cae043d1853fc630d0a5f4a86ade228a230cbb361854da8
-#+curl.3d04a4674405d7f90f5b4cb8d7d0ce00cbfbb7f3bfb1247f24978e62da53c9e5
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+m4.d87becddb34bfcc9570a150218e9c04f0b11fda5a1947732878a514f7b9af268
+#+libressl.226bf1bb8a711bf00afe7d8c11d1336563883c8b64ddb7dcab7623935c9c6538
+#+curl.55655ec26c265db43870c99c4706f480baca5926d2f45332ed473b006e897965
 #@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.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
 #+gnu-make.69bac45b9788ae51b55d84abdb050a1863403e3adb0ddd608036227a5202415e
 #+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
 #+nawk.e751b8be76a2fb59a2fe374e1f55c7da47b14ef1154eb8614d12107e6d68e88d
diff --git a/variants/ccx-x86_64/gperf b/variants/ccx-x86_64/gperf
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+m4.39ec04fbe9090fa1c5e29e847ee230f5b2001ca4d2261611d885328f50b614cd
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+m4.d87becddb34bfcc9570a150218e9c04f0b11fda5a1947732878a514f7b9af268
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+m4.39ec04fbe9090fa1c5e29e847ee230f5b2001ca4d2261611d885328f50b614cd
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+m4.d87becddb34bfcc9570a150218e9c04f0b11fda5a1947732878a514f7b9af268
 #@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.b26c8d9933bd6ec4e66cfebc19dc46516218804b500835de8de55c00438d7899
-#+busybox.f204029f319ffbfc8738117fd94b19ee001a7bcb8ec2ebfa69d607375b73c89e-
\ No newline at end of file
+#+linux-qemu-guest.eca903c48f1434212764b1b251e81b5517500b4dea90099d0dd5ea562e1f56c8
+#+busybox.fc88d714f5939b2f6f84c35d2d4dba2b0b69c7c4fa38e25c3423a9e2370df72d+
\ 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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+m4.39ec04fbe9090fa1c5e29e847ee230f5b2001ca4d2261611d885328f50b614cd
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+m4.d87becddb34bfcc9570a150218e9c04f0b11fda5a1947732878a514f7b9af268
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+m4.39ec04fbe9090fa1c5e29e847ee230f5b2001ca4d2261611d885328f50b614cd
-#+libmd.0bddd8caa71181ed8b2f40ec091dd825e5138653755494e30d53e94384bcab07
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+m4.d87becddb34bfcc9570a150218e9c04f0b11fda5a1947732878a514f7b9af268
+#+libmd.a08ee76585c3ffc21926936382cd276e1c97deaefffbe65b44a13029912d5a18
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+pkgconf-pkg-config.4dbe0a0c4f26f5314d8ae812ef60a36d2712ab219cf7cfc640dc356f2244ab3a
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+pkgconf-pkg-config.2fa2de99392a4945a4240fc66672dac11fc37e407f5cfe1fd17ad20a422ce220
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+m4.39ec04fbe9090fa1c5e29e847ee230f5b2001ca4d2261611d885328f50b614cd
-#+flex.a9f6eb6d5e24c3da9a05e60be21fa715c633b155e5d85fa3a900aa56820df946
-#+bison.dc76ff144da72f38194aae27695b8b69c3a1a808473988d748c2d83573033f05
-#+musl-fts.a94cd62b180a126048db5115303f1479e2a2ba5d746f06143ee53744150fce20
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+m4.d87becddb34bfcc9570a150218e9c04f0b11fda5a1947732878a514f7b9af268
+#+flex.8f70fb4c6c01f3eb2e2d1c07f78c2a56fb7e69a4d078d5184e912ba9db1786d4
+#+bison.58f4fe57003973b21d5743e84a688c26782f0ad153faac22979699be38f4219c
+#+musl-fts.e8bbf602f98c65bd8cd74bb352a98cc5f67f81020af73b0850beea5f8d4a9b87
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+zstd.d886fd8ae8d85aebd691c3991d1087da3182efdf3e015aa27d07fa71f90db784
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+zstd.da5b6acc2f12e7fbb362685c7a2e9d7face14f082a2391153e0dcac16e5a3468
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+m4.39ec04fbe9090fa1c5e29e847ee230f5b2001ca4d2261611d885328f50b614cd
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+m4.d87becddb34bfcc9570a150218e9c04f0b11fda5a1947732878a514f7b9af268
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+m4.39ec04fbe9090fa1c5e29e847ee230f5b2001ca4d2261611d885328f50b614cd
-#+ca-certificates-wip-donotuse.f07862aed07afaa90d7b384898bf8841ff36051f52a8bba91f92e63f15b0a93a
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+m4.d87becddb34bfcc9570a150218e9c04f0b11fda5a1947732878a514f7b9af268
+#+ca-certificates-wip-donotuse.4e9b121c1b1aa8359d28594e6a6b2820f6766fb321edfb28be92d1f01475079d
 #@sha256:a68fedc0edd976b9f35ecfdcb252d80dc12084b1bc4e945be7dc42c437d8b540:c_rehash.c
 #@untar:-z:sha256:6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954:.
 
@@ -103,7 +101,7 @@ make DESTDIR="$pthbs_destdir" install
 
 cd ..
 gcc ./c_rehash.c -o c_rehash --static -static -I"$pthbs_destdir/$prefix/include" -L"$pthbs_destdir/$prefix/library" -lssl -lcrypto
-cp -vs '/home/ccx/versions/ca-certificates-wip-donotuse.f07862aed07afaa90d7b384898bf8841ff36051f52a8bba91f92e63f15b0a93a/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/"
+cp -vs '/home/ccx/versions/ca-certificates-wip-donotuse.4e9b121c1b1aa8359d28594e6a6b2820f6766fb321edfb28be92d1f01475079d/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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+m4.39ec04fbe9090fa1c5e29e847ee230f5b2001ca4d2261611d885328f50b614cd
-#+pkgconf-pkg-config.4dbe0a0c4f26f5314d8ae812ef60a36d2712ab219cf7cfc640dc356f2244ab3a
-#+gperf.5748f5fdce6f98007bd325f61494ef3f50094e61936e3f39437fe87ee9a663e8
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+m4.d87becddb34bfcc9570a150218e9c04f0b11fda5a1947732878a514f7b9af268
+#+pkgconf-pkg-config.2fa2de99392a4945a4240fc66672dac11fc37e407f5cfe1fd17ad20a422ce220
+#+gperf.22b35128c99f5c2fecafe2e10576ed587e2a5a0b245839dbbca7409fd6b3da49
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+m4.39ec04fbe9090fa1c5e29e847ee230f5b2001ca4d2261611d885328f50b614cd
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+m4.d87becddb34bfcc9570a150218e9c04f0b11fda5a1947732878a514f7b9af268
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-modutils.8b48a8ce9db6a5576f206bdf5ae022fe61676fd95e6fdf1f153547c1ab5b652d
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+findutils.244f02771a878fd097df47f4bd62e8a93647b5998100c170da547c8b9fcb6906
-#+diffutils.d922124e66a108c5d2822ebc18a43cb935bcef0703a50972a438e3a40de524e1
-#+patch.d6895a83538ac738fe9a3a55ecee3a4f402042e83fe879c82617239d1c80f7d9
-#+flex.a9f6eb6d5e24c3da9a05e60be21fa715c633b155e5d85fa3a900aa56820df946
-#+bison.dc76ff144da72f38194aae27695b8b69c3a1a808473988d748c2d83573033f05
-#+rsync.6adcc2c2a251bec1bf073557cd0871c763ff1b19b5d46fd25c1a475fc186b84a
-#+zstd.d886fd8ae8d85aebd691c3991d1087da3182efdf3e015aa27d07fa71f90db784
-#+libelf.b13b5e0f1750947f30c3fb00966b497059e3e57257e7868e0c5af0fdeb7456fe
-#+pkgconf-pkg-config.4dbe0a0c4f26f5314d8ae812ef60a36d2712ab219cf7cfc640dc356f2244ab3a
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-modutils.0d7b21ad103b6a9e04545a2470dd12cdbbf8f11b4fc1467de1bd52846970f963
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+findutils.fb6a799f6323a2489070e91f41a409ba056a58d5e28ecfc72286befbb9d764ee
+#+diffutils.fbef4cb98ee7f09f60875d80636eb6a7c2616a0846ac11a43e75f80f5bf8ddce
+#+patch.8ee00af0cdae80ff430fa442b6f606e9bd66d64d98e8b5df2e7853390abc00bb
+#+flex.8f70fb4c6c01f3eb2e2d1c07f78c2a56fb7e69a4d078d5184e912ba9db1786d4
+#+bison.58f4fe57003973b21d5743e84a688c26782f0ad153faac22979699be38f4219c
+#+rsync.8dd224dc919800927f50ed6096d089116ed25e56b693707735aca32cb7ceb602
+#+zstd.da5b6acc2f12e7fbb362685c7a2e9d7face14f082a2391153e0dcac16e5a3468
+#+libelf.1f0f2bae57802c969d6773338b33af9fc7d715f1e120cd55f612b449731a6603
+#+pkgconf-pkg-config.2fa2de99392a4945a4240fc66672dac11fc37e407f5cfe1fd17ad20a422ce220
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-modutils.8b48a8ce9db6a5576f206bdf5ae022fe61676fd95e6fdf1f153547c1ab5b652d
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+findutils.244f02771a878fd097df47f4bd62e8a93647b5998100c170da547c8b9fcb6906
-#+diffutils.d922124e66a108c5d2822ebc18a43cb935bcef0703a50972a438e3a40de524e1
-#+patch.d6895a83538ac738fe9a3a55ecee3a4f402042e83fe879c82617239d1c80f7d9
-#+flex.a9f6eb6d5e24c3da9a05e60be21fa715c633b155e5d85fa3a900aa56820df946
-#+bison.dc76ff144da72f38194aae27695b8b69c3a1a808473988d748c2d83573033f05
-#+rsync.6adcc2c2a251bec1bf073557cd0871c763ff1b19b5d46fd25c1a475fc186b84a
-#+zstd.d886fd8ae8d85aebd691c3991d1087da3182efdf3e015aa27d07fa71f90db784
-#+libelf.b13b5e0f1750947f30c3fb00966b497059e3e57257e7868e0c5af0fdeb7456fe
-#+pkgconf-pkg-config.4dbe0a0c4f26f5314d8ae812ef60a36d2712ab219cf7cfc640dc356f2244ab3a
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-modutils.0d7b21ad103b6a9e04545a2470dd12cdbbf8f11b4fc1467de1bd52846970f963
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+findutils.fb6a799f6323a2489070e91f41a409ba056a58d5e28ecfc72286befbb9d764ee
+#+diffutils.fbef4cb98ee7f09f60875d80636eb6a7c2616a0846ac11a43e75f80f5bf8ddce
+#+patch.8ee00af0cdae80ff430fa442b6f606e9bd66d64d98e8b5df2e7853390abc00bb
+#+flex.8f70fb4c6c01f3eb2e2d1c07f78c2a56fb7e69a4d078d5184e912ba9db1786d4
+#+bison.58f4fe57003973b21d5743e84a688c26782f0ad153faac22979699be38f4219c
+#+rsync.8dd224dc919800927f50ed6096d089116ed25e56b693707735aca32cb7ceb602
+#+zstd.da5b6acc2f12e7fbb362685c7a2e9d7face14f082a2391153e0dcac16e5a3468
+#+libelf.1f0f2bae57802c969d6773338b33af9fc7d715f1e120cd55f612b449731a6603
+#+pkgconf-pkg-config.2fa2de99392a4945a4240fc66672dac11fc37e407f5cfe1fd17ad20a422ce220
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+zsh.d2764fd70ebf1801d5d5084f3d3fc2eb8269d4c69d47596310037304918e127d
-#+pthbs-banginstall.192aadfd6aae414a33837002940344bf81af86a4329001a17e87be11a1d08116
-#+execline.ff3918dfab3546c8783f2b8c2b72dd8657aae669dd60c6db5ba0b2b45f6151e9
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+ccx-utils.afef0584a482bc9ba120f3317abcd686c9e6a67db176ec542a40ea9cbe5fccea
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+zsh.58b6fe827e616e7c5c8ee9509345ee8af3b6e554fc5eec3f4d2c0bd57a7271b7
+#+pthbs-banginstall.a9ddeb71ceb295a94adddbcc5a9594875e9cc23c46e641f52fc85f8612ea3dcc
+#+execline.6c0015cfabf6f584cae445babbef047825036a6aeee8e8c6c871e72ffaec3dfd
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+ccx-utils.7223389a6f8e07e3b1608c8d4687188ea79249a7803a4077be0ba4a17de71ecf
 #@git:409db79b3e7e5fc6b73305471d9bbb6ac5c14036:logincaps
 
 
diff --git a/variants/ccx-x86_64/m4 b/variants/ccx-x86_64/m4
@@ -1,36 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
 #+nawk.e751b8be76a2fb59a2fe374e1f55c7da47b14ef1154eb8614d12107e6d68e88d
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+zsh.d2764fd70ebf1801d5d5084f3d3fc2eb8269d4c69d47596310037304918e127d
-#+pthbs-banginstall.192aadfd6aae414a33837002940344bf81af86a4329001a17e87be11a1d08116
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+zsh.58b6fe827e616e7c5c8ee9509345ee8af3b6e554fc5eec3f4d2c0bd57a7271b7
+#+pthbs-banginstall.a9ddeb71ceb295a94adddbcc5a9594875e9cc23c46e641f52fc85f8612ea3dcc
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+skalibs.d88879a3104d67fecb16e3e34b138b31ecb0541c52e3fa5abe9d4e8754b5a7af
-#+execline.ff3918dfab3546c8783f2b8c2b72dd8657aae669dd60c6db5ba0b2b45f6151e9
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+skalibs.85f0e37448b5b26916386690418ec6dae49d77edc272ce43ef737238aa07b1b3
+#+execline.6c0015cfabf6f584cae445babbef047825036a6aeee8e8c6c871e72ffaec3dfd
 #@git:96aef400b9f9d14f3bf54b0e444e9ad3665c4107:mdevd
 
 
@@ -49,7 +47,7 @@ cd 'mdevd'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.d88879a3104d67fecb16e3e34b138b31ecb0541c52e3fa5abe9d4e8754b5a7af/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.85f0e37448b5b26916386690418ec6dae49d77edc272ce43ef737238aa07b1b3/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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-dosfstools.4881ed447675fecf1e589a0400f5fb42f1ef5a0bf3b7ef7e28eb1da6874fbcee
-#+busybox-e2fsprogs.7fd0ff0183b391fe4e1621e2ad0bfcb354c7425e72b88b3aaa2ce68fbebaffb5
-#+busybox-iproute2.eaaadb05f1529fefcd64b92aeacb1aa5b1b86c07ad31abcf317158a07735d1b4
-#+busybox-iputils.f2a5f22050ba921a7aee8c0bd123679f07248981afcbe83f9c32b04a5d310625
-#+busybox-net-misc.7603404db30e398d2716f1403607ef85556df85a9f8d8bbcb824ab12a8a572fc
-#+busybox-net-tools.8c222eb2f4e6f465576895eba78d7c8629e0a121cc4b4430f456c809aea3f7cf
-#+busybox-traceroute.e3dd33df35bd2b5784cbd4d40fe4dd38390999f0f6282f99883b312d9f5b3fba
-#+busybox-wget.a8f2dc21a56b1075113f217f1db1b9f02f51566c25b7f0bc6fc945234b2128d0
-#+busybox-chpst.bbbe12e01a16717d83762f453bddcbdbf54a12e129bf5574c3e73a2bce3b1c88
-#+busybox-console.b1ddf4ff708c65cfbe98ddc690dc16281bd10ae41d7a75fa959a055e4a5cefc7
-#+busybox-getty.46a39138a7b81575eb2ee7c88deccebf23e9f53d838c69f6761efe67b27813e2
-#+busybox-i2c-tools.36e8d3e381586bb3af294c5d9541da6f3404ca054f0239ad82890724c7189737
-#+busybox-linux-extra.9ffb11b1231292badbf83632188cee56c283b8565cb36c368e66c3d98d891531
-#+busybox-mtd-utils.55d1ba4e18d3cde5c5655d90d32fb43c1bd264e42f0e1da512f96f315f66565e
-#+busybox-shadow.69d4684fa6895cd994f658bf77bdcd0a0955e086d71d91878690fff4f649f8e0
-#+busybox-su.cd3bd886424ef6010cfdd972cbba944d7247fad6b011849a3d85532cbda8f077
-#+busybox-util-linux-priv.bfb10fb79fd70805b05a98d8987ee0ef96128c5d8f54cd1881f0d2a9eb4ed62e
-#+busybox-logging.88c2f452824a4d909cae4bd6613bc56a3605f3d381b68d8f84fee66552b12e07
-#+busybox-cron.e47eef48b38ff283fc0b56357b0f5f52ccd21009cfe6f791c3cdabfdefbd70ce
-#+execline.ff3918dfab3546c8783f2b8c2b72dd8657aae669dd60c6db5ba0b2b45f6151e9
-#+s6.d284978672757d1c9542ea1d387fadbe20e253d4437307f7efe9b22ce16f6e4b
-#+mdev-scripts.d59329eedacc2868f27885abf0917c7d269c191aabcebca828b73fc9020dcfcf
-#+mdevd.df56ed9fd9339f911d378c05701310bf1ce1b78199f91632d6b25e908a4655d1
-#+busybox.f204029f319ffbfc8738117fd94b19ee001a7bcb8ec2ebfa69d607375b73c89e-
\ No newline at end of file
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-dosfstools.9bcc079e65c7f1b1e49032210544b028a5f5d0325a91088b69f19b5b46aca175
+#+busybox-e2fsprogs.69673574e2902bc3695e8690a1553393323957da06b8765d53228af9fa274141
+#+busybox-iproute2.515e135a0ea2255bb2ea2b6f90a78621e6d703bec0a3caecd45c2c130e7dd3b7
+#+busybox-iputils.b5e98392304bd1d69bbb4c28ed35be3a44e6d19fcd4cb86ac6f19580f6bcc94f
+#+busybox-net-misc.373b362033d0dc40ef0ced2744c81835fa801c2a2a708741d78c25faec826aac
+#+busybox-net-tools.9e6856c77d147a9cc17d51d5857d31df1ec95f9bd0a9afad0310b04e9e63f3e3
+#+busybox-traceroute.5ad375e78ece72608f0f3a42576a5c1a7157c4a9443c9506b7bc653b2ba6b336
+#+busybox-wget.a0d5a9eca1263a8a575f40e775f2e46f8b94eb3e9e87311facc55754f3457272
+#+busybox-chpst.36bd87104271b0b3d3ba1aad5870a48b6e61d2dc6eda39a73053f9ee0ff73523
+#+busybox-console.9aef149732c947a6e6b3d05184f7b4aeba980fc50f9e8ecada842e656ca2bbf4
+#+busybox-getty.6c7c7b0ba99603927efc9ab43f000e97d3831ef81fa0f34d6140edcd16ec2968
+#+busybox-i2c-tools.9b9ebc1fbc0618cc186e92a312b99fe583c86ba4c7f9a32a55a24b4e1f1839d2
+#+busybox-linux-extra.5afc0c0582f185d68dc1bf62a6a58158589b596604f29031b6f01d8d9297ba83
+#+busybox-mtd-utils.ca1ace238855cc587117a4c510a0a0a52c3f8b02e2164f379006153d9a317bc1
+#+busybox-shadow.5a02048f078a97d6fc6a8b986255c85a8fd740c68e00bbce8d6ffb2e309a447c
+#+busybox-su.4def7677fa294392c8447bbac9f58acf680a3c56ffd5f910362cc54550aa9a4c
+#+busybox-util-linux-priv.dac270757a016d86ba3867925477cd42220dbe5f5b58b0bd76c67d1c3f55a232
+#+busybox-logging.54bb0cc6957b9cd3cb4dfd27f43c5e6fd1ea8a14442166eb3b6d0ba6beaffd5a
+#+busybox-cron.fcd1f86a20e2691f6d86a6f5ac34056d0595d3b3dfe0fcfc6a60ecc482a7e972
+#+execline.6c0015cfabf6f584cae445babbef047825036a6aeee8e8c6c871e72ffaec3dfd
+#+s6.b18fdf1615dd798baa73249e1a7430663ff2f5f3d371c1e98c09e203b7343cac
+#+mdev-scripts.b5abaaad2f1cb55459cc2aacc9f86d8b9d9aca36f42317a91e68dbf3da32789e
+#+mdevd.a460c5b630ce5aa87601319a6663a71e86d4cb3b8e7ee55b722574621ca5aaad
+#+busybox.fc88d714f5939b2f6f84c35d2d4dba2b0b69c7c4fa38e25c3423a9e2370df72d+
\ 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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
 #@git:fefc95731f1260810a3551226b73d35f3d6e9d9e:mlog
 
 
diff --git a/variants/ccx-x86_64/musl-fts b/variants/ccx-x86_64/musl-fts
@@ -1,36 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
 #+nawk.e751b8be76a2fb59a2fe374e1f55c7da47b14ef1154eb8614d12107e6d68e88d
-#+bison.dc76ff144da72f38194aae27695b8b69c3a1a808473988d748c2d83573033f05
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
+#+bison.58f4fe57003973b21d5743e84a688c26782f0ad153faac22979699be38f4219c
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+m4.39ec04fbe9090fa1c5e29e847ee230f5b2001ca4d2261611d885328f50b614cd
-#+netbsd-curses.957f8d6eddd8ced3a13f77e134a770dad8e485d5124b74731c50181ec1728298
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+m4.d87becddb34bfcc9570a150218e9c04f0b11fda5a1947732878a514f7b9af268
+#+netbsd-curses.d3a35e9679b89711abfe52fd0b045b76a652ad0f7712aa8236e7ef9c89ddfc4c
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+ocaml.8c516d26ec593144e385acbd20047b1d9f8e395929b2bd8c19f0e21f5cbb2845
-#+ocaml-findlib.5b4c675e65b0c6b7d0f7ed0eab746470526a762efe9be7a36098c62d8704429f
-#+ocamlbuild.b119783695c537b83f46c1dbb50febb0bcc4e26f9b38ba0f44d3153c5b205ee8
-#+opam.9697463ce285328966053b749067bb32529d4ddb7ca20b42dcf9c86a376565d6
-#+ocaml-topkg.822e309711f833ceffa19a992b97fa6c857f214ca434a3e26c14cbfc5d1848f6
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+ocaml.dcc1b1f9d3951e24ea8d985579f24974ad22c275748e0bccf4718e897bdd933d
+#+ocaml-findlib.c288d866bf814f05b1fa24dc8f8179844db0b66059e56d2e5ca05b35be679417
+#+ocamlbuild.c09e6cbb77d051e40eae3a2ffda77a0734172722d49d1b4f6d88688b4d654538
+#+opam.536d49b21544d4c72b9d98c2b7aeec2d76bf7e6e3bfb1418d86caf001721646e
+#+ocaml-topkg.f20ce6c5947ccdc8a48ad9afe5bcd1db7461380ff2b47938124330b0dd4b344d
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+ocaml.8c516d26ec593144e385acbd20047b1d9f8e395929b2bd8c19f0e21f5cbb2845
-#+dune.47edb484541fc330d979c031eb3c9e5db70c5c2627716766c107b01789f20594
-#+ocaml_intrinsics_kernel.3b3e331a0320f486d47c22c46f7eb4564a0954a4dac750e474879f66c78da2c2
-#+ocaml-sexplib0.7bfd3d720e88c37c0fd610403434964c5fcd065586137e51f873725e20f1a2ed
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+ocaml.dcc1b1f9d3951e24ea8d985579f24974ad22c275748e0bccf4718e897bdd933d
+#+dune.4031c2eb3da87619b6a50f3b95aa0ce42202daa8a3d2d09425f4601b17229983
+#+ocaml_intrinsics_kernel.8c320bd0b1bad1f06f2d11a63e5550c561669706bc9bfd66b13787b7dee486c7
+#+ocaml-sexplib0.47e698bf2bd5188918c1b5128ddc90d005275cd7d78ff50d58fb1c0a8707ad3f
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+ocaml.8c516d26ec593144e385acbd20047b1d9f8e395929b2bd8c19f0e21f5cbb2845
-#+ocaml-findlib.5b4c675e65b0c6b7d0f7ed0eab746470526a762efe9be7a36098c62d8704429f
-#+ocamlbuild.b119783695c537b83f46c1dbb50febb0bcc4e26f9b38ba0f44d3153c5b205ee8
-#+opam.9697463ce285328966053b749067bb32529d4ddb7ca20b42dcf9c86a376565d6
-#+ocaml-topkg.822e309711f833ceffa19a992b97fa6c857f214ca434a3e26c14cbfc5d1848f6
-#+ocaml-astring.6557b5681165059b4efea1fef37e01487e465db5c73b6def35216bcad7854256
-#+ocaml-fpath.6e3bcfabca2869559a4c93d3cead38227a590bae403ebd302570ff35b69fb2e2
-#+ocaml-rresult.6f5a3f32252aea78febddc9d18ea29d2d065c3e331d4bcdff60ffe20f89c638d
-#+ocaml-fmt.b9dcc531281d6c9fb15b0e685861cdc9c7efd624c52bdfb2c233ee7fed3661d0
-#+ocaml-logs.8d17f67610b0721dc33505702c27aee780ad923b5c9b3e72f06fd9c598a077e4
-#+ocaml-mtime.a90d53ed29d2b43035e52663bc2d65277cff95e8c5a4e633f91fc5dfed7ada98
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+ocaml.dcc1b1f9d3951e24ea8d985579f24974ad22c275748e0bccf4718e897bdd933d
+#+ocaml-findlib.c288d866bf814f05b1fa24dc8f8179844db0b66059e56d2e5ca05b35be679417
+#+ocamlbuild.c09e6cbb77d051e40eae3a2ffda77a0734172722d49d1b4f6d88688b4d654538
+#+opam.536d49b21544d4c72b9d98c2b7aeec2d76bf7e6e3bfb1418d86caf001721646e
+#+ocaml-topkg.f20ce6c5947ccdc8a48ad9afe5bcd1db7461380ff2b47938124330b0dd4b344d
+#+ocaml-astring.06e78e54d49b050a96bcd2c70e53920a292df7885caf2738c5df00d3939a4b32
+#+ocaml-fpath.b0bc5e04db5c702cc4320e05df907eb7bd19c1aa4b0a7f2449b267bbd4d3b65f
+#+ocaml-rresult.3cfe6c5c563ae9465735e05ef66fe59eabd2b1f2b1d98399d85eab625b782b81
+#+ocaml-fmt.9d40d6b94066f2675bef302a1ddd919c797bd594db0af6f1ed9f4a3735157243
+#+ocaml-logs.9e7e481c88f3ce3b970ae724834e22ffe24cfba3363611fd2b3425ecd44be8b3
+#+ocaml-mtime.4d75d2cb99a1e0b833b7db69035dffc40eefe9e44f3d9dc6dc3992be54a22ad8
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+ocaml.8c516d26ec593144e385acbd20047b1d9f8e395929b2bd8c19f0e21f5cbb2845
-#+ocaml-findlib.5b4c675e65b0c6b7d0f7ed0eab746470526a762efe9be7a36098c62d8704429f
-#+ocamlbuild.b119783695c537b83f46c1dbb50febb0bcc4e26f9b38ba0f44d3153c5b205ee8
-#+opam.9697463ce285328966053b749067bb32529d4ddb7ca20b42dcf9c86a376565d6
-#+ocaml-topkg.822e309711f833ceffa19a992b97fa6c857f214ca434a3e26c14cbfc5d1848f6
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+ocaml.dcc1b1f9d3951e24ea8d985579f24974ad22c275748e0bccf4718e897bdd933d
+#+ocaml-findlib.c288d866bf814f05b1fa24dc8f8179844db0b66059e56d2e5ca05b35be679417
+#+ocamlbuild.c09e6cbb77d051e40eae3a2ffda77a0734172722d49d1b4f6d88688b4d654538
+#+opam.536d49b21544d4c72b9d98c2b7aeec2d76bf7e6e3bfb1418d86caf001721646e
+#+ocaml-topkg.f20ce6c5947ccdc8a48ad9afe5bcd1db7461380ff2b47938124330b0dd4b344d
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+ocaml.8c516d26ec593144e385acbd20047b1d9f8e395929b2bd8c19f0e21f5cbb2845
-#+dune.47edb484541fc330d979c031eb3c9e5db70c5c2627716766c107b01789f20594
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+ocaml.dcc1b1f9d3951e24ea8d985579f24974ad22c275748e0bccf4718e897bdd933d
+#+dune.4031c2eb3da87619b6a50f3b95aa0ce42202daa8a3d2d09425f4601b17229983
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+ocaml.8c516d26ec593144e385acbd20047b1d9f8e395929b2bd8c19f0e21f5cbb2845
-#+dune.47edb484541fc330d979c031eb3c9e5db70c5c2627716766c107b01789f20594
-#+ocamlbuild.b119783695c537b83f46c1dbb50febb0bcc4e26f9b38ba0f44d3153c5b205ee8
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+ocaml.dcc1b1f9d3951e24ea8d985579f24974ad22c275748e0bccf4718e897bdd933d
+#+dune.4031c2eb3da87619b6a50f3b95aa0ce42202daa8a3d2d09425f4601b17229983
+#+ocamlbuild.c09e6cbb77d051e40eae3a2ffda77a0734172722d49d1b4f6d88688b4d654538
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+m4.39ec04fbe9090fa1c5e29e847ee230f5b2001ca4d2261611d885328f50b614cd
-#+netbsd-curses.957f8d6eddd8ced3a13f77e134a770dad8e485d5124b74731c50181ec1728298
-#+ocaml.8c516d26ec593144e385acbd20047b1d9f8e395929b2bd8c19f0e21f5cbb2845
-#+ocamlbuild.b119783695c537b83f46c1dbb50febb0bcc4e26f9b38ba0f44d3153c5b205ee8
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+m4.d87becddb34bfcc9570a150218e9c04f0b11fda5a1947732878a514f7b9af268
+#+netbsd-curses.d3a35e9679b89711abfe52fd0b045b76a652ad0f7712aa8236e7ef9c89ddfc4c
+#+ocaml.dcc1b1f9d3951e24ea8d985579f24974ad22c275748e0bccf4718e897bdd933d
+#+ocamlbuild.c09e6cbb77d051e40eae3a2ffda77a0734172722d49d1b4f6d88688b4d654538
 #@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.8c516d26ec593144e385acbd20047b1d9f8e395929b2bd8c19f0e21f5cbb2845"
+stdlib="$pthbs_destdir/home/ccx/versions/ocaml.dcc1b1f9d3951e24ea8d985579f24974ad22c275748e0bccf4718e897bdd933d"
 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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+ocaml.8c516d26ec593144e385acbd20047b1d9f8e395929b2bd8c19f0e21f5cbb2845
-#+ocaml-findlib.5b4c675e65b0c6b7d0f7ed0eab746470526a762efe9be7a36098c62d8704429f
-#+ocamlbuild.b119783695c537b83f46c1dbb50febb0bcc4e26f9b38ba0f44d3153c5b205ee8
-#+opam.9697463ce285328966053b749067bb32529d4ddb7ca20b42dcf9c86a376565d6
-#+ocaml-topkg.822e309711f833ceffa19a992b97fa6c857f214ca434a3e26c14cbfc5d1848f6
-#+ocaml-cmdliner.6cb3839612f2da0e2711d437242f7f900886ea78123b21d317aaa5030ff47c84
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+ocaml.dcc1b1f9d3951e24ea8d985579f24974ad22c275748e0bccf4718e897bdd933d
+#+ocaml-findlib.c288d866bf814f05b1fa24dc8f8179844db0b66059e56d2e5ca05b35be679417
+#+ocamlbuild.c09e6cbb77d051e40eae3a2ffda77a0734172722d49d1b4f6d88688b4d654538
+#+opam.536d49b21544d4c72b9d98c2b7aeec2d76bf7e6e3bfb1418d86caf001721646e
+#+ocaml-topkg.f20ce6c5947ccdc8a48ad9afe5bcd1db7461380ff2b47938124330b0dd4b344d
+#+ocaml-cmdliner.f182c7d88e4997b31eee54246c83cc78066e35b1252fab5b1d49cf99c55f8695
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+ocaml.8c516d26ec593144e385acbd20047b1d9f8e395929b2bd8c19f0e21f5cbb2845
-#+ocaml-findlib.5b4c675e65b0c6b7d0f7ed0eab746470526a762efe9be7a36098c62d8704429f
-#+ocamlbuild.b119783695c537b83f46c1dbb50febb0bcc4e26f9b38ba0f44d3153c5b205ee8
-#+opam.9697463ce285328966053b749067bb32529d4ddb7ca20b42dcf9c86a376565d6
-#+ocaml-topkg.822e309711f833ceffa19a992b97fa6c857f214ca434a3e26c14cbfc5d1848f6
-#+ocaml-astring.6557b5681165059b4efea1fef37e01487e465db5c73b6def35216bcad7854256
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+ocaml.dcc1b1f9d3951e24ea8d985579f24974ad22c275748e0bccf4718e897bdd933d
+#+ocaml-findlib.c288d866bf814f05b1fa24dc8f8179844db0b66059e56d2e5ca05b35be679417
+#+ocamlbuild.c09e6cbb77d051e40eae3a2ffda77a0734172722d49d1b4f6d88688b4d654538
+#+opam.536d49b21544d4c72b9d98c2b7aeec2d76bf7e6e3bfb1418d86caf001721646e
+#+ocaml-topkg.f20ce6c5947ccdc8a48ad9afe5bcd1db7461380ff2b47938124330b0dd4b344d
+#+ocaml-astring.06e78e54d49b050a96bcd2c70e53920a292df7885caf2738c5df00d3939a4b32
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+ocaml.8c516d26ec593144e385acbd20047b1d9f8e395929b2bd8c19f0e21f5cbb2845
-#+ocaml-findlib.5b4c675e65b0c6b7d0f7ed0eab746470526a762efe9be7a36098c62d8704429f
-#+ocamlbuild.b119783695c537b83f46c1dbb50febb0bcc4e26f9b38ba0f44d3153c5b205ee8
-#+opam.9697463ce285328966053b749067bb32529d4ddb7ca20b42dcf9c86a376565d6
-#+ocaml-topkg.822e309711f833ceffa19a992b97fa6c857f214ca434a3e26c14cbfc5d1848f6
-#+ocaml-mtime.a90d53ed29d2b43035e52663bc2d65277cff95e8c5a4e633f91fc5dfed7ada98
-#+ocaml-cmdliner.6cb3839612f2da0e2711d437242f7f900886ea78123b21d317aaa5030ff47c84
-#+ocaml-fmt.b9dcc531281d6c9fb15b0e685861cdc9c7efd624c52bdfb2c233ee7fed3661d0
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+ocaml.dcc1b1f9d3951e24ea8d985579f24974ad22c275748e0bccf4718e897bdd933d
+#+ocaml-findlib.c288d866bf814f05b1fa24dc8f8179844db0b66059e56d2e5ca05b35be679417
+#+ocamlbuild.c09e6cbb77d051e40eae3a2ffda77a0734172722d49d1b4f6d88688b4d654538
+#+opam.536d49b21544d4c72b9d98c2b7aeec2d76bf7e6e3bfb1418d86caf001721646e
+#+ocaml-topkg.f20ce6c5947ccdc8a48ad9afe5bcd1db7461380ff2b47938124330b0dd4b344d
+#+ocaml-mtime.4d75d2cb99a1e0b833b7db69035dffc40eefe9e44f3d9dc6dc3992be54a22ad8
+#+ocaml-cmdliner.f182c7d88e4997b31eee54246c83cc78066e35b1252fab5b1d49cf99c55f8695
+#+ocaml-fmt.9d40d6b94066f2675bef302a1ddd919c797bd594db0af6f1ed9f4a3735157243
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+ocaml.8c516d26ec593144e385acbd20047b1d9f8e395929b2bd8c19f0e21f5cbb2845
-#+dune.47edb484541fc330d979c031eb3c9e5db70c5c2627716766c107b01789f20594
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+ocaml.dcc1b1f9d3951e24ea8d985579f24974ad22c275748e0bccf4718e897bdd933d
+#+dune.4031c2eb3da87619b6a50f3b95aa0ce42202daa8a3d2d09425f4601b17229983
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+ocaml.8c516d26ec593144e385acbd20047b1d9f8e395929b2bd8c19f0e21f5cbb2845
-#+ocaml-findlib.5b4c675e65b0c6b7d0f7ed0eab746470526a762efe9be7a36098c62d8704429f
-#+ocamlbuild.b119783695c537b83f46c1dbb50febb0bcc4e26f9b38ba0f44d3153c5b205ee8
-#+opam.9697463ce285328966053b749067bb32529d4ddb7ca20b42dcf9c86a376565d6
-#+ocaml-topkg.822e309711f833ceffa19a992b97fa6c857f214ca434a3e26c14cbfc5d1848f6
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+ocaml.dcc1b1f9d3951e24ea8d985579f24974ad22c275748e0bccf4718e897bdd933d
+#+ocaml-findlib.c288d866bf814f05b1fa24dc8f8179844db0b66059e56d2e5ca05b35be679417
+#+ocamlbuild.c09e6cbb77d051e40eae3a2ffda77a0734172722d49d1b4f6d88688b4d654538
+#+opam.536d49b21544d4c72b9d98c2b7aeec2d76bf7e6e3bfb1418d86caf001721646e
+#+ocaml-topkg.f20ce6c5947ccdc8a48ad9afe5bcd1db7461380ff2b47938124330b0dd4b344d
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+ocaml.8c516d26ec593144e385acbd20047b1d9f8e395929b2bd8c19f0e21f5cbb2845
-#+dune.47edb484541fc330d979c031eb3c9e5db70c5c2627716766c107b01789f20594
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+ocaml.dcc1b1f9d3951e24ea8d985579f24974ad22c275748e0bccf4718e897bdd933d
+#+dune.4031c2eb3da87619b6a50f3b95aa0ce42202daa8a3d2d09425f4601b17229983
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+ocaml.8c516d26ec593144e385acbd20047b1d9f8e395929b2bd8c19f0e21f5cbb2845
-#+dune.47edb484541fc330d979c031eb3c9e5db70c5c2627716766c107b01789f20594
-#+ocaml-compiler-libs.830df532e47658b920936a31faeca5facada5786a8cce03901a5898874f7de35
-#+ocaml-cppo.0daf676687d83fee1bddcdadb530e342cc71cef57027b1802730baa438923b87
-#+ocaml-findlib.5b4c675e65b0c6b7d0f7ed0eab746470526a762efe9be7a36098c62d8704429f
-#+ocaml-ppx_derivers.e4acc04f0b2383c88558978bad6296337a0bf19c74b60cde47e65e7e540665e1
-#+ocaml-ppxlib.52de9ad8ec22c6e1061c98fa15ae709eb2696d5d724853a75d2af13a3f6dd7aa
-#+ocaml-sexplib0.7bfd3d720e88c37c0fd610403434964c5fcd065586137e51f873725e20f1a2ed
-#+ocaml-stdlib-shims.23bf0275ca6aa7585bcd0ff4be756add6258989e9b75d4c54d5ffd94b09ea8c1
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+ocaml.dcc1b1f9d3951e24ea8d985579f24974ad22c275748e0bccf4718e897bdd933d
+#+dune.4031c2eb3da87619b6a50f3b95aa0ce42202daa8a3d2d09425f4601b17229983
+#+ocaml-compiler-libs.9f24caf3b7d66d2e44cb6ff82a780d9c2f3bd5673930ba12009d77bf65bf53a3
+#+ocaml-cppo.3b8eed1bcc31291b245e9a14ba463a16c4882f5e785879721efb58df90431688
+#+ocaml-findlib.c288d866bf814f05b1fa24dc8f8179844db0b66059e56d2e5ca05b35be679417
+#+ocaml-ppx_derivers.b846eff748bc4be1bfb2e8480616aaa5fa10a68fb22a910d828e2647e3218e51
+#+ocaml-ppxlib.30952f6c0cdfd00186915ffeeeccdb3190226f72a3bff09c71b23952a2a13e01
+#+ocaml-sexplib0.47e698bf2bd5188918c1b5128ddc90d005275cd7d78ff50d58fb1c0a8707ad3f
+#+ocaml-stdlib-shims.097c692df918c3fe822040fceba3a5b2dfd7c7d2324b39ffbc6ea721655129d6
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+ocaml.8c516d26ec593144e385acbd20047b1d9f8e395929b2bd8c19f0e21f5cbb2845
-#+dune.47edb484541fc330d979c031eb3c9e5db70c5c2627716766c107b01789f20594
-#+ocaml-compiler-libs.830df532e47658b920936a31faeca5facada5786a8cce03901a5898874f7de35
-#+ocaml-ppx_derivers.e4acc04f0b2383c88558978bad6296337a0bf19c74b60cde47e65e7e540665e1
-#+ocaml-sexplib0.7bfd3d720e88c37c0fd610403434964c5fcd065586137e51f873725e20f1a2ed
-#+ocaml-stdlib-shims.23bf0275ca6aa7585bcd0ff4be756add6258989e9b75d4c54d5ffd94b09ea8c1
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+ocaml.dcc1b1f9d3951e24ea8d985579f24974ad22c275748e0bccf4718e897bdd933d
+#+dune.4031c2eb3da87619b6a50f3b95aa0ce42202daa8a3d2d09425f4601b17229983
+#+ocaml-compiler-libs.9f24caf3b7d66d2e44cb6ff82a780d9c2f3bd5673930ba12009d77bf65bf53a3
+#+ocaml-ppx_derivers.b846eff748bc4be1bfb2e8480616aaa5fa10a68fb22a910d828e2647e3218e51
+#+ocaml-sexplib0.47e698bf2bd5188918c1b5128ddc90d005275cd7d78ff50d58fb1c0a8707ad3f
+#+ocaml-stdlib-shims.097c692df918c3fe822040fceba3a5b2dfd7c7d2324b39ffbc6ea721655129d6
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+ocaml.8c516d26ec593144e385acbd20047b1d9f8e395929b2bd8c19f0e21f5cbb2845
-#+ocaml-findlib.5b4c675e65b0c6b7d0f7ed0eab746470526a762efe9be7a36098c62d8704429f
-#+ocamlbuild.b119783695c537b83f46c1dbb50febb0bcc4e26f9b38ba0f44d3153c5b205ee8
-#+opam.9697463ce285328966053b749067bb32529d4ddb7ca20b42dcf9c86a376565d6
-#+ocaml-topkg.822e309711f833ceffa19a992b97fa6c857f214ca434a3e26c14cbfc5d1848f6
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+ocaml.dcc1b1f9d3951e24ea8d985579f24974ad22c275748e0bccf4718e897bdd933d
+#+ocaml-findlib.c288d866bf814f05b1fa24dc8f8179844db0b66059e56d2e5ca05b35be679417
+#+ocamlbuild.c09e6cbb77d051e40eae3a2ffda77a0734172722d49d1b4f6d88688b4d654538
+#+opam.536d49b21544d4c72b9d98c2b7aeec2d76bf7e6e3bfb1418d86caf001721646e
+#+ocaml-topkg.f20ce6c5947ccdc8a48ad9afe5bcd1db7461380ff2b47938124330b0dd4b344d
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+ocaml.8c516d26ec593144e385acbd20047b1d9f8e395929b2bd8c19f0e21f5cbb2845
-#+dune.47edb484541fc330d979c031eb3c9e5db70c5c2627716766c107b01789f20594
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+ocaml.dcc1b1f9d3951e24ea8d985579f24974ad22c275748e0bccf4718e897bdd933d
+#+dune.4031c2eb3da87619b6a50f3b95aa0ce42202daa8a3d2d09425f4601b17229983
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+ocaml.8c516d26ec593144e385acbd20047b1d9f8e395929b2bd8c19f0e21f5cbb2845
-#+dune.47edb484541fc330d979c031eb3c9e5db70c5c2627716766c107b01789f20594
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+ocaml.dcc1b1f9d3951e24ea8d985579f24974ad22c275748e0bccf4718e897bdd933d
+#+dune.4031c2eb3da87619b6a50f3b95aa0ce42202daa8a3d2d09425f4601b17229983
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+ocaml.8c516d26ec593144e385acbd20047b1d9f8e395929b2bd8c19f0e21f5cbb2845
-#+ocaml-findlib.5b4c675e65b0c6b7d0f7ed0eab746470526a762efe9be7a36098c62d8704429f
-#+ocamlbuild.b119783695c537b83f46c1dbb50febb0bcc4e26f9b38ba0f44d3153c5b205ee8
-#+opam.9697463ce285328966053b749067bb32529d4ddb7ca20b42dcf9c86a376565d6
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+ocaml.dcc1b1f9d3951e24ea8d985579f24974ad22c275748e0bccf4718e897bdd933d
+#+ocaml-findlib.c288d866bf814f05b1fa24dc8f8179844db0b66059e56d2e5ca05b35be679417
+#+ocamlbuild.c09e6cbb77d051e40eae3a2ffda77a0734172722d49d1b4f6d88688b4d654538
+#+opam.536d49b21544d4c72b9d98c2b7aeec2d76bf7e6e3bfb1418d86caf001721646e
 #@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.8c516d26ec593144e385acbd20047b1d9f8e395929b2bd8c19f0e21f5cbb2845
-#+dune.47edb484541fc330d979c031eb3c9e5db70c5c2627716766c107b01789f20594
-#+ocamlbuild.b119783695c537b83f46c1dbb50febb0bcc4e26f9b38ba0f44d3153c5b205ee8
-#+ocaml-base.900f2b2824a32c559b51e5d5e72e942ad76464baaf06d3a6e4d722b250013b08
-#+opam.9697463ce285328966053b749067bb32529d4ddb7ca20b42dcf9c86a376565d6
-#+ocaml-bos.a24151150008a128ad51677f52b7cf361b66a95e196bb456d5b82d4be26c9477
-#+ocaml-lun.524add3806fb3130f5cb5ad1d9f602be439588d41713772a72b21f584ed6751e
-#+ocaml-ppx_deriving.abbb7fc61258268241a341554fbb5643fe1e2095188f262a864e78e3e126fb0b-
\ No newline at end of file
+#+ocaml.dcc1b1f9d3951e24ea8d985579f24974ad22c275748e0bccf4718e897bdd933d
+#+dune.4031c2eb3da87619b6a50f3b95aa0ce42202daa8a3d2d09425f4601b17229983
+#+ocamlbuild.c09e6cbb77d051e40eae3a2ffda77a0734172722d49d1b4f6d88688b4d654538
+#+ocaml-base.a4f5300dc6fe20bb32885eb4e0ac47c0146f9109cc9717c0a6d2828eef7a7977
+#+opam.536d49b21544d4c72b9d98c2b7aeec2d76bf7e6e3bfb1418d86caf001721646e
+#+ocaml-bos.3396a837328d5f460f6dceaf1b80c52c02c0571c316c122565f3fd77d60eedba
+#+ocaml-lun.3d4eaa131f95d0de4bca7e86a44c24e1eccdbb25d4ced1a5ba859e81b49ea5b8
+#+ocaml-ppx_deriving.affba8312cb74bbe5b8ec906313b97fd468a7cc680ebe85acc277440f4ccf5c6+
\ 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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+m4.39ec04fbe9090fa1c5e29e847ee230f5b2001ca4d2261611d885328f50b614cd
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+m4.d87becddb34bfcc9570a150218e9c04f0b11fda5a1947732878a514f7b9af268
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+ocaml.8c516d26ec593144e385acbd20047b1d9f8e395929b2bd8c19f0e21f5cbb2845
-#+dune.47edb484541fc330d979c031eb3c9e5db70c5c2627716766c107b01789f20594
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+ocaml.dcc1b1f9d3951e24ea8d985579f24974ad22c275748e0bccf4718e897bdd933d
+#+dune.4031c2eb3da87619b6a50f3b95aa0ce42202daa8a3d2d09425f4601b17229983
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+m4.39ec04fbe9090fa1c5e29e847ee230f5b2001ca4d2261611d885328f50b614cd
-#+ocaml.8c516d26ec593144e385acbd20047b1d9f8e395929b2bd8c19f0e21f5cbb2845
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+m4.d87becddb34bfcc9570a150218e9c04f0b11fda5a1947732878a514f7b9af268
+#+ocaml.dcc1b1f9d3951e24ea8d985579f24974ad22c275748e0bccf4718e897bdd933d
 #@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.8c516d26ec593144e385acbd20047b1d9f8e395929b2bd8c19f0e21f5cbb2845"
+stdlib="$pthbs_destdir/home/ccx/versions/ocaml.dcc1b1f9d3951e24ea8d985579f24974ad22c275748e0bccf4718e897bdd933d"
 mkdir -p "${stdlib%/*}"
 ln -s "$pthbs_package" "$stdlib"
 
diff --git a/variants/ccx-x86_64/opam b/variants/ccx-x86_64/opam
@@ -1,41 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+diffutils.d922124e66a108c5d2822ebc18a43cb935bcef0703a50972a438e3a40de524e1
-#+patch.d6895a83538ac738fe9a3a55ecee3a4f402042e83fe879c82617239d1c80f7d9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+getconf.59dccb5ffd9845b7ce18241fbc754ae599aed1c62845e5befa1021efc2fd7469
-#+ocaml.8c516d26ec593144e385acbd20047b1d9f8e395929b2bd8c19f0e21f5cbb2845
-#+dune.47edb484541fc330d979c031eb3c9e5db70c5c2627716766c107b01789f20594
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+diffutils.fbef4cb98ee7f09f60875d80636eb6a7c2616a0846ac11a43e75f80f5bf8ddce
+#+patch.8ee00af0cdae80ff430fa442b6f606e9bd66d64d98e8b5df2e7853390abc00bb
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+getconf.bd17f5d96474cf19fc1dfc65f6e3a913ecdeec46703131e6dec3377a7e78031e
+#+ocaml.dcc1b1f9d3951e24ea8d985579f24974ad22c275748e0bccf4718e897bdd933d
+#+dune.4031c2eb3da87619b6a50f3b95aa0ce42202daa8a3d2d09425f4601b17229983
 #@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.47edb484541fc330d979c031eb3c9e5db70c5c2627716766c107b01789f20594/command/dune' \
+	--with-dune='/home/ccx/versions/dune.4031c2eb3da87619b6a50f3b95aa0ce42202daa8a3d2d09425f4601b17229983/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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+m4.39ec04fbe9090fa1c5e29e847ee230f5b2001ca4d2261611d885328f50b614cd
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+m4.d87becddb34bfcc9570a150218e9c04f0b11fda5a1947732878a514f7b9af268
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+m4.39ec04fbe9090fa1c5e29e847ee230f5b2001ca4d2261611d885328f50b614cd
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+m4.d87becddb34bfcc9570a150218e9c04f0b11fda5a1947732878a514f7b9af268
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+pkgconf.3a4d62ce1c7a0ae3f29d38f317bff2e9d0d2f4f57a23d49f0da2040e2a245ba3
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+pkgconf.d6fcc37a0eb4fcb51c0e002c2a2477a0fe98a207c4233940ba2971eb28aee851
 
 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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+m4.39ec04fbe9090fa1c5e29e847ee230f5b2001ca4d2261611d885328f50b614cd
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+m4.d87becddb34bfcc9570a150218e9c04f0b11fda5a1947732878a514f7b9af268
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+zsh.d2764fd70ebf1801d5d5084f3d3fc2eb8269d4c69d47596310037304918e127d
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+zsh.58b6fe827e616e7c5c8ee9509345ee8af3b6e554fc5eec3f4d2c0bd57a7271b7
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+m4.39ec04fbe9090fa1c5e29e847ee230f5b2001ca4d2261611d885328f50b614cd
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+popt.895de3f00435bcc46640af13713ff8299ed289fa0dec6b84b11dffe813958d65
-#+libressl.81c01c5ea3583a370cae043d1853fc630d0a5f4a86ade228a230cbb361854da8
-#+zstd.d886fd8ae8d85aebd691c3991d1087da3182efdf3e015aa27d07fa71f90db784
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+m4.d87becddb34bfcc9570a150218e9c04f0b11fda5a1947732878a514f7b9af268
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+popt.6a6a28e62b17610618b2c6a271bd2f3abd6bd97a191e59be85061a08cca0fa29
+#+libressl.226bf1bb8a711bf00afe7d8c11d1336563883c8b64ddb7dcab7623935c9c6538
+#+zstd.da5b6acc2f12e7fbb362685c7a2e9d7face14f082a2391153e0dcac16e5a3468
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+skalibs.d88879a3104d67fecb16e3e34b138b31ecb0541c52e3fa5abe9d4e8754b5a7af
-#+execline.ff3918dfab3546c8783f2b8c2b72dd8657aae669dd60c6db5ba0b2b45f6151e9
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+skalibs.85f0e37448b5b26916386690418ec6dae49d77edc272ce43ef737238aa07b1b3
+#+execline.6c0015cfabf6f584cae445babbef047825036a6aeee8e8c6c871e72ffaec3dfd
 #@git:0e02fe0e92b8f9a619fc355babad2c78c009c1f1:s6
 
 
@@ -49,7 +47,7 @@ cd 's6'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.d88879a3104d67fecb16e3e34b138b31ecb0541c52e3fa5abe9d4e8754b5a7af/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.85f0e37448b5b26916386690418ec6dae49d77edc272ce43ef737238aa07b1b3/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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+skalibs.d88879a3104d67fecb16e3e34b138b31ecb0541c52e3fa5abe9d4e8754b5a7af
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+skalibs.85f0e37448b5b26916386690418ec6dae49d77edc272ce43ef737238aa07b1b3
 #@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.d88879a3104d67fecb16e3e34b138b31ecb0541c52e3fa5abe9d4e8754b5a7af/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.85f0e37448b5b26916386690418ec6dae49d77edc272ce43ef737238aa07b1b3/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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+skalibs.d88879a3104d67fecb16e3e34b138b31ecb0541c52e3fa5abe9d4e8754b5a7af
-#+execline.ff3918dfab3546c8783f2b8c2b72dd8657aae669dd60c6db5ba0b2b45f6151e9
-#+s6.d284978672757d1c9542ea1d387fadbe20e253d4437307f7efe9b22ce16f6e4b
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+skalibs.85f0e37448b5b26916386690418ec6dae49d77edc272ce43ef737238aa07b1b3
+#+execline.6c0015cfabf6f584cae445babbef047825036a6aeee8e8c6c871e72ffaec3dfd
+#+s6.b18fdf1615dd798baa73249e1a7430663ff2f5f3d371c1e98c09e203b7343cac
 #@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.d88879a3104d67fecb16e3e34b138b31ecb0541c52e3fa5abe9d4e8754b5a7af/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.85f0e37448b5b26916386690418ec6dae49d77edc272ce43ef737238aa07b1b3/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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+skalibs.d88879a3104d67fecb16e3e34b138b31ecb0541c52e3fa5abe9d4e8754b5a7af
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+skalibs.85f0e37448b5b26916386690418ec6dae49d77edc272ce43ef737238aa07b1b3
 #@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.d88879a3104d67fecb16e3e34b138b31ecb0541c52e3fa5abe9d4e8754b5a7af/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.85f0e37448b5b26916386690418ec6dae49d77edc272ce43ef737238aa07b1b3/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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+skalibs.d88879a3104d67fecb16e3e34b138b31ecb0541c52e3fa5abe9d4e8754b5a7af
-#+execline.ff3918dfab3546c8783f2b8c2b72dd8657aae669dd60c6db5ba0b2b45f6151e9
-#+s6.d284978672757d1c9542ea1d387fadbe20e253d4437307f7efe9b22ce16f6e4b
-#+s6-dns.5d2a41c8398ac7e16dbeb6061d8b8328f9a309f2e308a52a40b963c8fc72f598
-#+libressl.81c01c5ea3583a370cae043d1853fc630d0a5f4a86ade228a230cbb361854da8
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+skalibs.85f0e37448b5b26916386690418ec6dae49d77edc272ce43ef737238aa07b1b3
+#+execline.6c0015cfabf6f584cae445babbef047825036a6aeee8e8c6c871e72ffaec3dfd
+#+s6.b18fdf1615dd798baa73249e1a7430663ff2f5f3d371c1e98c09e203b7343cac
+#+s6-dns.494cf73b6ae89aa7e09ea7ba86f35284d02692e9cdb7b5c942caa5cdc1c31e70
+#+libressl.226bf1bb8a711bf00afe7d8c11d1336563883c8b64ddb7dcab7623935c9c6538
 #@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.d88879a3104d67fecb16e3e34b138b31ecb0541c52e3fa5abe9d4e8754b5a7af/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.85f0e37448b5b26916386690418ec6dae49d77edc272ce43ef737238aa07b1b3/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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+skalibs.d88879a3104d67fecb16e3e34b138b31ecb0541c52e3fa5abe9d4e8754b5a7af
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+skalibs.85f0e37448b5b26916386690418ec6dae49d77edc272ce43ef737238aa07b1b3
 #@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.d88879a3104d67fecb16e3e34b138b31ecb0541c52e3fa5abe9d4e8754b5a7af/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.85f0e37448b5b26916386690418ec6dae49d77edc272ce43ef737238aa07b1b3/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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+skalibs.d88879a3104d67fecb16e3e34b138b31ecb0541c52e3fa5abe9d4e8754b5a7af
-#+execline.ff3918dfab3546c8783f2b8c2b72dd8657aae669dd60c6db5ba0b2b45f6151e9
-#+s6.d284978672757d1c9542ea1d387fadbe20e253d4437307f7efe9b22ce16f6e4b
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+skalibs.85f0e37448b5b26916386690418ec6dae49d77edc272ce43ef737238aa07b1b3
+#+execline.6c0015cfabf6f584cae445babbef047825036a6aeee8e8c6c871e72ffaec3dfd
+#+s6.b18fdf1615dd798baa73249e1a7430663ff2f5f3d371c1e98c09e203b7343cac
 #@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.d88879a3104d67fecb16e3e34b138b31ecb0541c52e3fa5abe9d4e8754b5a7af/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.85f0e37448b5b26916386690418ec6dae49d77edc272ce43ef737238aa07b1b3/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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+zsh.d2764fd70ebf1801d5d5084f3d3fc2eb8269d4c69d47596310037304918e127d
-#+pthbs-banginstall.192aadfd6aae414a33837002940344bf81af86a4329001a17e87be11a1d08116
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+zsh.58b6fe827e616e7c5c8ee9509345ee8af3b6e554fc5eec3f4d2c0bd57a7271b7
+#+pthbs-banginstall.a9ddeb71ceb295a94adddbcc5a9594875e9cc23c46e641f52fc85f8612ea3dcc
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+attr.279b0fbf1c45d4ac37ec10291c74f6aeec3b2cc67947a4682c53f4483813021f
-#+zstd.d886fd8ae8d85aebd691c3991d1087da3182efdf3e015aa27d07fa71f90db784
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+attr.306198f6fc35a1286e8d40bee2a2328ff7ddf4941d47cb2ee6d2267d25c6ec51
+#+zstd.da5b6acc2f12e7fbb362685c7a2e9d7face14f082a2391153e0dcac16e5a3468
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+m4.39ec04fbe9090fa1c5e29e847ee230f5b2001ca4d2261611d885328f50b614cd
-#+patch.d6895a83538ac738fe9a3a55ecee3a4f402042e83fe879c82617239d1c80f7d9
-#+libunwind.85d8563b3d998abc909d4b8103c3902897cdce26699c8a8ae2d1ac5c83385a97
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+m4.d87becddb34bfcc9570a150218e9c04f0b11fda5a1947732878a514f7b9af268
+#+patch.8ee00af0cdae80ff430fa442b6f606e9bd66d64d98e8b5df2e7853390abc00bb
+#+libunwind.9e1f9d779bcd3e144962ddc40a753ba6b57e2a16da088d3707009384dd38fe8d
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-dosfstools.4881ed447675fecf1e589a0400f5fb42f1ef5a0bf3b7ef7e28eb1da6874fbcee
-#+busybox-e2fsprogs.7fd0ff0183b391fe4e1621e2ad0bfcb354c7425e72b88b3aaa2ce68fbebaffb5
-#+busybox-iproute2.eaaadb05f1529fefcd64b92aeacb1aa5b1b86c07ad31abcf317158a07735d1b4
-#+busybox-iputils.f2a5f22050ba921a7aee8c0bd123679f07248981afcbe83f9c32b04a5d310625
-#+busybox-net-misc.7603404db30e398d2716f1403607ef85556df85a9f8d8bbcb824ab12a8a572fc
-#+busybox-net-tools.8c222eb2f4e6f465576895eba78d7c8629e0a121cc4b4430f456c809aea3f7cf
-#+busybox-traceroute.e3dd33df35bd2b5784cbd4d40fe4dd38390999f0f6282f99883b312d9f5b3fba
-#+busybox-wget.a8f2dc21a56b1075113f217f1db1b9f02f51566c25b7f0bc6fc945234b2128d0
-#+busybox-chpst.bbbe12e01a16717d83762f453bddcbdbf54a12e129bf5574c3e73a2bce3b1c88
-#+busybox-console.b1ddf4ff708c65cfbe98ddc690dc16281bd10ae41d7a75fa959a055e4a5cefc7
-#+busybox-getty.46a39138a7b81575eb2ee7c88deccebf23e9f53d838c69f6761efe67b27813e2
-#+busybox-i2c-tools.36e8d3e381586bb3af294c5d9541da6f3404ca054f0239ad82890724c7189737
-#+busybox-linux-extra.9ffb11b1231292badbf83632188cee56c283b8565cb36c368e66c3d98d891531
-#+busybox-mtd-utils.55d1ba4e18d3cde5c5655d90d32fb43c1bd264e42f0e1da512f96f315f66565e
-#+busybox-shadow.69d4684fa6895cd994f658bf77bdcd0a0955e086d71d91878690fff4f649f8e0
-#+busybox-su.cd3bd886424ef6010cfdd972cbba944d7247fad6b011849a3d85532cbda8f077
-#+busybox-util-linux-priv.bfb10fb79fd70805b05a98d8987ee0ef96128c5d8f54cd1881f0d2a9eb4ed62e
-#+busybox-logging.88c2f452824a4d909cae4bd6613bc56a3605f3d381b68d8f84fee66552b12e07
-#+busybox-cron.e47eef48b38ff283fc0b56357b0f5f52ccd21009cfe6f791c3cdabfdefbd70ce
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+diffutils.d922124e66a108c5d2822ebc18a43cb935bcef0703a50972a438e3a40de524e1
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+aat.f6d4a205e6a4ea2cc2e095f84a8774780b4a4b42f5e6e79fe5b5b631e1e44d13
-#+fileset.8a55a9ddd70127190b4e062bbf11b69788a3f901700fe6eda4bd3e2dd293d576
-#+rsync.6adcc2c2a251bec1bf073557cd0871c763ff1b19b5d46fd25c1a475fc186b84a
-#+execline.ff3918dfab3546c8783f2b8c2b72dd8657aae669dd60c6db5ba0b2b45f6151e9
-#+kbd.62f668b4707d5d42de524c84128693b59bde80f2096dd43a809f55e78c59ba9b
-#+mdevd.df56ed9fd9339f911d378c05701310bf1ce1b78199f91632d6b25e908a4655d1
-#+s6-linux-utils.a14648af37be9adfbe620ba60d6ebd87b5a4c7a5d0c5fd8704ab9772b7e92266
-#+s6-rc.14ca43321a87060248bb6a856e153a28f24eea1bae4172bbf5eaa253a7163363
-#+s6.d284978672757d1c9542ea1d387fadbe20e253d4437307f7efe9b22ce16f6e4b
-#+zsh.d2764fd70ebf1801d5d5084f3d3fc2eb8269d4c69d47596310037304918e127d
-#+libcgroup.13595a7c51c71b567ce0aff9e94ea00c0d8daf330161e59b85d76a9c4020bd1f
-#+system-config-scripts.65dec2086a4805e45d3144778b8b8dbb27e778599d39a85efab5a086090eb079
-#+logincaps.17812fc8b5daa9a052f4b73d50bc0e7923d030165b5a1307b5af9264da0a74d9
-#+busybox.f204029f319ffbfc8738117fd94b19ee001a7bcb8ec2ebfa69d607375b73c89e
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-dosfstools.9bcc079e65c7f1b1e49032210544b028a5f5d0325a91088b69f19b5b46aca175
+#+busybox-e2fsprogs.69673574e2902bc3695e8690a1553393323957da06b8765d53228af9fa274141
+#+busybox-iproute2.515e135a0ea2255bb2ea2b6f90a78621e6d703bec0a3caecd45c2c130e7dd3b7
+#+busybox-iputils.b5e98392304bd1d69bbb4c28ed35be3a44e6d19fcd4cb86ac6f19580f6bcc94f
+#+busybox-net-misc.373b362033d0dc40ef0ced2744c81835fa801c2a2a708741d78c25faec826aac
+#+busybox-net-tools.9e6856c77d147a9cc17d51d5857d31df1ec95f9bd0a9afad0310b04e9e63f3e3
+#+busybox-traceroute.5ad375e78ece72608f0f3a42576a5c1a7157c4a9443c9506b7bc653b2ba6b336
+#+busybox-wget.a0d5a9eca1263a8a575f40e775f2e46f8b94eb3e9e87311facc55754f3457272
+#+busybox-chpst.36bd87104271b0b3d3ba1aad5870a48b6e61d2dc6eda39a73053f9ee0ff73523
+#+busybox-console.9aef149732c947a6e6b3d05184f7b4aeba980fc50f9e8ecada842e656ca2bbf4
+#+busybox-getty.6c7c7b0ba99603927efc9ab43f000e97d3831ef81fa0f34d6140edcd16ec2968
+#+busybox-i2c-tools.9b9ebc1fbc0618cc186e92a312b99fe583c86ba4c7f9a32a55a24b4e1f1839d2
+#+busybox-linux-extra.5afc0c0582f185d68dc1bf62a6a58158589b596604f29031b6f01d8d9297ba83
+#+busybox-mtd-utils.ca1ace238855cc587117a4c510a0a0a52c3f8b02e2164f379006153d9a317bc1
+#+busybox-shadow.5a02048f078a97d6fc6a8b986255c85a8fd740c68e00bbce8d6ffb2e309a447c
+#+busybox-su.4def7677fa294392c8447bbac9f58acf680a3c56ffd5f910362cc54550aa9a4c
+#+busybox-util-linux-priv.dac270757a016d86ba3867925477cd42220dbe5f5b58b0bd76c67d1c3f55a232
+#+busybox-logging.54bb0cc6957b9cd3cb4dfd27f43c5e6fd1ea8a14442166eb3b6d0ba6beaffd5a
+#+busybox-cron.fcd1f86a20e2691f6d86a6f5ac34056d0595d3b3dfe0fcfc6a60ecc482a7e972
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+diffutils.fbef4cb98ee7f09f60875d80636eb6a7c2616a0846ac11a43e75f80f5bf8ddce
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+aat.7b99ea17519b070d75e112bf642178489362d4a7b765b264eb0d9bc07648c1ac
+#+fileset.6b3e7e2768e83fd75ab2b052cfab37dd0c1616d29331edd82018aa4800b36988
+#+rsync.8dd224dc919800927f50ed6096d089116ed25e56b693707735aca32cb7ceb602
+#+execline.6c0015cfabf6f584cae445babbef047825036a6aeee8e8c6c871e72ffaec3dfd
+#+kbd.a2228b2b1be4abe9a7ab07104ee38f135b341491404dbc64d39db0f05e8fcf7b
+#+mdevd.a460c5b630ce5aa87601319a6663a71e86d4cb3b8e7ee55b722574621ca5aaad
+#+s6-linux-utils.2861ec0c9a2e6085aaebc07d20cb49c9c54c6511e7879c1d079d115c0198e35d
+#+s6-rc.2fde1e944c3af08b844ab925bf7619557868e4b28a0eb75e9b65acd0a48d22e7
+#+s6.b18fdf1615dd798baa73249e1a7430663ff2f5f3d371c1e98c09e203b7343cac
+#+zsh.58b6fe827e616e7c5c8ee9509345ee8af3b6e554fc5eec3f4d2c0bd57a7271b7
+#+libcgroup.60fc90c31a9a9c9a586010d946db8052f6608d5574a9986f4f3805416c1f5293
+#+system-config-scripts.898b3816292c1d58f39c981940c2e52b0f3e938f25ed022a39414e87228ff266
+#+logincaps.9405204dd8fd882c77876c05e1d64b470765985f55b8c901b3e34efb74c2ada2
+#+busybox.fc88d714f5939b2f6f84c35d2d4dba2b0b69c7c4fa38e25c3423a9e2370df72d
 #@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.42fd3254b5fff40bf3ae7c268c4c7b074e426b8c3dff17be8f3c69b03483f842' \
-	'pthbs_path_mdevd=/home/ccx/versions/env.5b38c051b7336b82f5930cfc89c2eab90c196f9cdf414afae10611ee9743c7f9' \
+	'pthbs_path_containers=/home/ccx/versions/env.d4a622654bf52018cd2fe2a56490abf03a06e9e1d15a8e4954cd6a90d11e8116' \
+	'pthbs_path_mdevd=/home/ccx/versions/env.117377673dcbdee9f2a51da2bd61bd2ab2d26d57563c78a1a537dc920a5aa6d1' \
 	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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+busybox-dosfstools.4881ed447675fecf1e589a0400f5fb42f1ef5a0bf3b7ef7e28eb1da6874fbcee
-#+busybox-e2fsprogs.7fd0ff0183b391fe4e1621e2ad0bfcb354c7425e72b88b3aaa2ce68fbebaffb5
-#+busybox-iproute2.eaaadb05f1529fefcd64b92aeacb1aa5b1b86c07ad31abcf317158a07735d1b4
-#+busybox-iputils.f2a5f22050ba921a7aee8c0bd123679f07248981afcbe83f9c32b04a5d310625
-#+busybox-net-misc.7603404db30e398d2716f1403607ef85556df85a9f8d8bbcb824ab12a8a572fc
-#+busybox-net-tools.8c222eb2f4e6f465576895eba78d7c8629e0a121cc4b4430f456c809aea3f7cf
-#+busybox-traceroute.e3dd33df35bd2b5784cbd4d40fe4dd38390999f0f6282f99883b312d9f5b3fba
-#+busybox-wget.a8f2dc21a56b1075113f217f1db1b9f02f51566c25b7f0bc6fc945234b2128d0
-#+busybox-chpst.bbbe12e01a16717d83762f453bddcbdbf54a12e129bf5574c3e73a2bce3b1c88
-#+busybox-console.b1ddf4ff708c65cfbe98ddc690dc16281bd10ae41d7a75fa959a055e4a5cefc7
-#+busybox-getty.46a39138a7b81575eb2ee7c88deccebf23e9f53d838c69f6761efe67b27813e2
-#+busybox-i2c-tools.36e8d3e381586bb3af294c5d9541da6f3404ca054f0239ad82890724c7189737
-#+busybox-linux-extra.9ffb11b1231292badbf83632188cee56c283b8565cb36c368e66c3d98d891531
-#+busybox-mtd-utils.55d1ba4e18d3cde5c5655d90d32fb43c1bd264e42f0e1da512f96f315f66565e
-#+busybox-shadow.69d4684fa6895cd994f658bf77bdcd0a0955e086d71d91878690fff4f649f8e0
-#+busybox-su.cd3bd886424ef6010cfdd972cbba944d7247fad6b011849a3d85532cbda8f077
-#+busybox-util-linux-priv.bfb10fb79fd70805b05a98d8987ee0ef96128c5d8f54cd1881f0d2a9eb4ed62e
-#+busybox-logging.88c2f452824a4d909cae4bd6613bc56a3605f3d381b68d8f84fee66552b12e07
-#+busybox-cron.e47eef48b38ff283fc0b56357b0f5f52ccd21009cfe6f791c3cdabfdefbd70ce
-#+s6.d284978672757d1c9542ea1d387fadbe20e253d4437307f7efe9b22ce16f6e4b
-#+s6-rc.14ca43321a87060248bb6a856e153a28f24eea1bae4172bbf5eaa253a7163363
-#+s6-portable-utils.f53394f2cb8225037ed4849f4cf4f1cbb5fe6c72a984e71d18c850741c3e49af
-#+s6-linux-init.766e495c215eaf1b63647fb37b377ccc3243441060f70f76a00b5b1f77f56e21
-#+execline.ff3918dfab3546c8783f2b8c2b72dd8657aae669dd60c6db5ba0b2b45f6151e9
-#+system-config-rc.41b2c9512cb4992b9f438fc5f983a3acf8b8dd339d5f06eb056302f08027364d
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+busybox-dosfstools.9bcc079e65c7f1b1e49032210544b028a5f5d0325a91088b69f19b5b46aca175
+#+busybox-e2fsprogs.69673574e2902bc3695e8690a1553393323957da06b8765d53228af9fa274141
+#+busybox-iproute2.515e135a0ea2255bb2ea2b6f90a78621e6d703bec0a3caecd45c2c130e7dd3b7
+#+busybox-iputils.b5e98392304bd1d69bbb4c28ed35be3a44e6d19fcd4cb86ac6f19580f6bcc94f
+#+busybox-net-misc.373b362033d0dc40ef0ced2744c81835fa801c2a2a708741d78c25faec826aac
+#+busybox-net-tools.9e6856c77d147a9cc17d51d5857d31df1ec95f9bd0a9afad0310b04e9e63f3e3
+#+busybox-traceroute.5ad375e78ece72608f0f3a42576a5c1a7157c4a9443c9506b7bc653b2ba6b336
+#+busybox-wget.a0d5a9eca1263a8a575f40e775f2e46f8b94eb3e9e87311facc55754f3457272
+#+busybox-chpst.36bd87104271b0b3d3ba1aad5870a48b6e61d2dc6eda39a73053f9ee0ff73523
+#+busybox-console.9aef149732c947a6e6b3d05184f7b4aeba980fc50f9e8ecada842e656ca2bbf4
+#+busybox-getty.6c7c7b0ba99603927efc9ab43f000e97d3831ef81fa0f34d6140edcd16ec2968
+#+busybox-i2c-tools.9b9ebc1fbc0618cc186e92a312b99fe583c86ba4c7f9a32a55a24b4e1f1839d2
+#+busybox-linux-extra.5afc0c0582f185d68dc1bf62a6a58158589b596604f29031b6f01d8d9297ba83
+#+busybox-mtd-utils.ca1ace238855cc587117a4c510a0a0a52c3f8b02e2164f379006153d9a317bc1
+#+busybox-shadow.5a02048f078a97d6fc6a8b986255c85a8fd740c68e00bbce8d6ffb2e309a447c
+#+busybox-su.4def7677fa294392c8447bbac9f58acf680a3c56ffd5f910362cc54550aa9a4c
+#+busybox-util-linux-priv.dac270757a016d86ba3867925477cd42220dbe5f5b58b0bd76c67d1c3f55a232
+#+busybox-logging.54bb0cc6957b9cd3cb4dfd27f43c5e6fd1ea8a14442166eb3b6d0ba6beaffd5a
+#+busybox-cron.fcd1f86a20e2691f6d86a6f5ac34056d0595d3b3dfe0fcfc6a60ecc482a7e972
+#+s6.b18fdf1615dd798baa73249e1a7430663ff2f5f3d371c1e98c09e203b7343cac
+#+s6-rc.2fde1e944c3af08b844ab925bf7619557868e4b28a0eb75e9b65acd0a48d22e7
+#+s6-portable-utils.a90109e5c7600970ca72af1335ca07aad6b1b044e3ddac48d91222471e08c2b5
+#+s6-linux-init.bb3502f93d9accf8f005706a6f09f6e9439e64ad2f73cc80a076ebe7dbe9b542
+#+execline.6c0015cfabf6f584cae445babbef047825036a6aeee8e8c6c871e72ffaec3dfd
+#+system-config-rc.02aa6372cac8d7e3ce90243a627af0be92df6eb091be3c76e429ab5676c56637
 
 
 # - build script start -
@@ -76,7 +76,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-s6rcdb=/home/ccx/versions/system-config-rc.41b2c9512cb4992b9f438fc5f983a3acf8b8dd339d5f06eb056302f08027364d/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.02aa6372cac8d7e3ce90243a627af0be92df6eb091be3c76e429ab5676c56637/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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+s6-rc.14ca43321a87060248bb6a856e153a28f24eea1bae4172bbf5eaa253a7163363
-#+fileset.8a55a9ddd70127190b4e062bbf11b69788a3f901700fe6eda4bd3e2dd293d576
-#+system-config.e0629e6e9db4b65946ebecbf27583b246cae3d41af9d9cef0512014b433f3796
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+s6-rc.2fde1e944c3af08b844ab925bf7619557868e4b28a0eb75e9b65acd0a48d22e7
+#+fileset.6b3e7e2768e83fd75ab2b052cfab37dd0c1616d29331edd82018aa4800b36988
+#+system-config.98be5c89cd031856d94a74324c9b7d0631efc3ea951fa56b4176f46859730349
 
 
 # - build script start -
@@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-src=/home/ccx/versions/system-config.e0629e6e9db4b65946ebecbf27583b246cae3d41af9d9cef0512014b433f3796/config/s6-rc-source
+src=/home/ccx/versions/system-config.98be5c89cd031856d94a74324c9b7d0631efc3ea951fa56b4176f46859730349/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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+zsh.d2764fd70ebf1801d5d5084f3d3fc2eb8269d4c69d47596310037304918e127d
-#+pthbs-banginstall.192aadfd6aae414a33837002940344bf81af86a4329001a17e87be11a1d08116
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+zsh.58b6fe827e616e7c5c8ee9509345ee8af3b6e554fc5eec3f4d2c0bd57a7271b7
+#+pthbs-banginstall.a9ddeb71ceb295a94adddbcc5a9594875e9cc23c46e641f52fc85f8612ea3dcc
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+zsh.d2764fd70ebf1801d5d5084f3d3fc2eb8269d4c69d47596310037304918e127d
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+zsh.58b6fe827e616e7c5c8ee9509345ee8af3b6e554fc5eec3f4d2c0bd57a7271b7
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
 #@untar:-z:sha256:f3ae622c765db4e0d791ea90a9feba39d7f693ef9cb949a797f7ad6b404a2d61:.
 
 
diff --git a/variants/ccx-x86_64/user-env b/variants/ccx-x86_64/user-env
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+execline.ff3918dfab3546c8783f2b8c2b72dd8657aae669dd60c6db5ba0b2b45f6151e9
-#+pthbs-banginstall.192aadfd6aae414a33837002940344bf81af86a4329001a17e87be11a1d08116
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+execline.6c0015cfabf6f584cae445babbef047825036a6aeee8e8c6c871e72ffaec3dfd
+#+pthbs-banginstall.a9ddeb71ceb295a94adddbcc5a9594875e9cc23c46e641f52fc85f8612ea3dcc
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-dosfstools.4881ed447675fecf1e589a0400f5fb42f1ef5a0bf3b7ef7e28eb1da6874fbcee
-#+busybox-e2fsprogs.7fd0ff0183b391fe4e1621e2ad0bfcb354c7425e72b88b3aaa2ce68fbebaffb5
-#+busybox-iproute2.eaaadb05f1529fefcd64b92aeacb1aa5b1b86c07ad31abcf317158a07735d1b4
-#+busybox-iputils.f2a5f22050ba921a7aee8c0bd123679f07248981afcbe83f9c32b04a5d310625
-#+busybox-net-misc.7603404db30e398d2716f1403607ef85556df85a9f8d8bbcb824ab12a8a572fc
-#+busybox-net-tools.8c222eb2f4e6f465576895eba78d7c8629e0a121cc4b4430f456c809aea3f7cf
-#+busybox-traceroute.e3dd33df35bd2b5784cbd4d40fe4dd38390999f0f6282f99883b312d9f5b3fba
-#+busybox-wget.a8f2dc21a56b1075113f217f1db1b9f02f51566c25b7f0bc6fc945234b2128d0
-#+busybox-chpst.bbbe12e01a16717d83762f453bddcbdbf54a12e129bf5574c3e73a2bce3b1c88
-#+busybox-console.b1ddf4ff708c65cfbe98ddc690dc16281bd10ae41d7a75fa959a055e4a5cefc7
-#+busybox-getty.46a39138a7b81575eb2ee7c88deccebf23e9f53d838c69f6761efe67b27813e2
-#+busybox-i2c-tools.36e8d3e381586bb3af294c5d9541da6f3404ca054f0239ad82890724c7189737
-#+busybox-linux-extra.9ffb11b1231292badbf83632188cee56c283b8565cb36c368e66c3d98d891531
-#+busybox-mtd-utils.55d1ba4e18d3cde5c5655d90d32fb43c1bd264e42f0e1da512f96f315f66565e
-#+busybox-shadow.69d4684fa6895cd994f658bf77bdcd0a0955e086d71d91878690fff4f649f8e0
-#+busybox-su.cd3bd886424ef6010cfdd972cbba944d7247fad6b011849a3d85532cbda8f077
-#+busybox-util-linux-priv.bfb10fb79fd70805b05a98d8987ee0ef96128c5d8f54cd1881f0d2a9eb4ed62e
-#+busybox-logging.88c2f452824a4d909cae4bd6613bc56a3605f3d381b68d8f84fee66552b12e07
-#+busybox-cron.e47eef48b38ff283fc0b56357b0f5f52ccd21009cfe6f791c3cdabfdefbd70ce
-#+attr.279b0fbf1c45d4ac37ec10291c74f6aeec3b2cc67947a4682c53f4483813021f
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+diffutils.d922124e66a108c5d2822ebc18a43cb935bcef0703a50972a438e3a40de524e1
-#+patch.d6895a83538ac738fe9a3a55ecee3a4f402042e83fe879c82617239d1c80f7d9
-#+flex.a9f6eb6d5e24c3da9a05e60be21fa715c633b155e5d85fa3a900aa56820df946
-#+bison.dc76ff144da72f38194aae27695b8b69c3a1a808473988d748c2d83573033f05
-#+rsync.6adcc2c2a251bec1bf073557cd0871c763ff1b19b5d46fd25c1a475fc186b84a
-#+execline.ff3918dfab3546c8783f2b8c2b72dd8657aae669dd60c6db5ba0b2b45f6151e9
-#+s6.d284978672757d1c9542ea1d387fadbe20e253d4437307f7efe9b22ce16f6e4b
-#+s6-rc.14ca43321a87060248bb6a856e153a28f24eea1bae4172bbf5eaa253a7163363
-#+s6-portable-utils.f53394f2cb8225037ed4849f4cf4f1cbb5fe6c72a984e71d18c850741c3e49af
-#+s6-linux-utils.a14648af37be9adfbe620ba60d6ebd87b5a4c7a5d0c5fd8704ab9772b7e92266
-#+s6-linux-init.766e495c215eaf1b63647fb37b377ccc3243441060f70f76a00b5b1f77f56e21
-#+mdevd.df56ed9fd9339f911d378c05701310bf1ce1b78199f91632d6b25e908a4655d1
-#+s6-dns.5d2a41c8398ac7e16dbeb6061d8b8328f9a309f2e308a52a40b963c8fc72f598
-#+libressl.81c01c5ea3583a370cae043d1853fc630d0a5f4a86ade228a230cbb361854da8
-#+s6-networking.5ad1df7af0204fd42c2efb4142897695371a81f06a732b5be7fe35230fdf053e
-#+zsh.d2764fd70ebf1801d5d5084f3d3fc2eb8269d4c69d47596310037304918e127d
-#+pthbs-banginstall.192aadfd6aae414a33837002940344bf81af86a4329001a17e87be11a1d08116
-#+aat.f6d4a205e6a4ea2cc2e095f84a8774780b4a4b42f5e6e79fe5b5b631e1e44d13
-#+confz.9474186508db0bd608559481454a192045a6a1b82a803ba75cdcafa233d92ae7
-#+containers.0b81d0d62ff82e5a08329b824b00d2fe1091efe5a8f47645da1050ed055f32dc
-#+fileset.8a55a9ddd70127190b4e062bbf11b69788a3f901700fe6eda4bd3e2dd293d576
-#+logincaps.17812fc8b5daa9a052f4b73d50bc0e7923d030165b5a1307b5af9264da0a74d9
-#+snaprep.7b9c88f05e8d693a9f4a737b2d1ec03330998707bf4fc40b7ae4089a7438e7a8
-#+curl.3d04a4674405d7f90f5b4cb8d7d0ce00cbfbb7f3bfb1247f24978e62da53c9e5
-#+git.a155d5d58fde21f9d348e6a0968da5a15e530b4fa6560c9d4498d507e89476f3
-#+xbps.4a0b5f265e5402c3801c05f283380d72f276da68d780ce780103d7d93cb18a7f
-#+apk-tools.59b5cfaa2bdd14ba3e5ca1399c56eeac3990de1f7792d8b5e53a6e9e188ba5f0
-#+getent.50274bf559d10d64a9c6a48a4d164fb36d23325ae8632b000c9c26d37b5c002d
-#+getconf.59dccb5ffd9845b7ce18241fbc754ae599aed1c62845e5befa1021efc2fd7469
-#+iconv.ae6d151f44744cd70e1deef24f2adb5a661db7dc7c955a0dd01e1dacf76d53a2
-#+libcap.bccc2cabad81a84e25a8475aa6ef01fe2f79237e52830993fa6ffc106ea49acf
-#+applyuidgid-caps.69831bf8d138a75a5672bbaf4c97a49b4c76e5b22d96cba681b9d701e42914d3
-#+ccx-utils.afef0584a482bc9ba120f3317abcd686c9e6a67db176ec542a40ea9cbe5fccea
-#+user-env.0fe6c7a053a79b4494ca6dd3d19838a3927a648d1552474d4fe62487eea541d8
-#+strace.0b940b8cb286451945a9bc6dad0304c43fdb336685f15623dff6f08da8a93769
-#+mlog.01e68df888274f1ab8eade5381555265409fe3a08012d75758ae4782bc3c509e
-#+findutils.244f02771a878fd097df47f4bd62e8a93647b5998100c170da547c8b9fcb6906
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+nvi.6730dce779d170ffbc22b702865f99531795b81a8afb3407ea8db0ab63a06c5e
-#+squashfs-tools.e3c33c1acddd8f41f61b7c7d7d4b83d112aee1c784f367be47ee5fb8b2996585
-#+mandoc.1b747ff7d11cfe44184e78a5c844a77bfd1c7d805431859eae9b350619efa1b6
-#+tinyssh.990e5f780a0a4113a8d53cddd2e23d9d12503816c0a7dcf9ee77bcff5c17efcd-
\ No newline at end of file
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-dosfstools.9bcc079e65c7f1b1e49032210544b028a5f5d0325a91088b69f19b5b46aca175
+#+busybox-e2fsprogs.69673574e2902bc3695e8690a1553393323957da06b8765d53228af9fa274141
+#+busybox-iproute2.515e135a0ea2255bb2ea2b6f90a78621e6d703bec0a3caecd45c2c130e7dd3b7
+#+busybox-iputils.b5e98392304bd1d69bbb4c28ed35be3a44e6d19fcd4cb86ac6f19580f6bcc94f
+#+busybox-net-misc.373b362033d0dc40ef0ced2744c81835fa801c2a2a708741d78c25faec826aac
+#+busybox-net-tools.9e6856c77d147a9cc17d51d5857d31df1ec95f9bd0a9afad0310b04e9e63f3e3
+#+busybox-traceroute.5ad375e78ece72608f0f3a42576a5c1a7157c4a9443c9506b7bc653b2ba6b336
+#+busybox-wget.a0d5a9eca1263a8a575f40e775f2e46f8b94eb3e9e87311facc55754f3457272
+#+busybox-chpst.36bd87104271b0b3d3ba1aad5870a48b6e61d2dc6eda39a73053f9ee0ff73523
+#+busybox-console.9aef149732c947a6e6b3d05184f7b4aeba980fc50f9e8ecada842e656ca2bbf4
+#+busybox-getty.6c7c7b0ba99603927efc9ab43f000e97d3831ef81fa0f34d6140edcd16ec2968
+#+busybox-i2c-tools.9b9ebc1fbc0618cc186e92a312b99fe583c86ba4c7f9a32a55a24b4e1f1839d2
+#+busybox-linux-extra.5afc0c0582f185d68dc1bf62a6a58158589b596604f29031b6f01d8d9297ba83
+#+busybox-mtd-utils.ca1ace238855cc587117a4c510a0a0a52c3f8b02e2164f379006153d9a317bc1
+#+busybox-shadow.5a02048f078a97d6fc6a8b986255c85a8fd740c68e00bbce8d6ffb2e309a447c
+#+busybox-su.4def7677fa294392c8447bbac9f58acf680a3c56ffd5f910362cc54550aa9a4c
+#+busybox-util-linux-priv.dac270757a016d86ba3867925477cd42220dbe5f5b58b0bd76c67d1c3f55a232
+#+busybox-logging.54bb0cc6957b9cd3cb4dfd27f43c5e6fd1ea8a14442166eb3b6d0ba6beaffd5a
+#+busybox-cron.fcd1f86a20e2691f6d86a6f5ac34056d0595d3b3dfe0fcfc6a60ecc482a7e972
+#+attr.306198f6fc35a1286e8d40bee2a2328ff7ddf4941d47cb2ee6d2267d25c6ec51
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+diffutils.fbef4cb98ee7f09f60875d80636eb6a7c2616a0846ac11a43e75f80f5bf8ddce
+#+patch.8ee00af0cdae80ff430fa442b6f606e9bd66d64d98e8b5df2e7853390abc00bb
+#+flex.8f70fb4c6c01f3eb2e2d1c07f78c2a56fb7e69a4d078d5184e912ba9db1786d4
+#+bison.58f4fe57003973b21d5743e84a688c26782f0ad153faac22979699be38f4219c
+#+rsync.8dd224dc919800927f50ed6096d089116ed25e56b693707735aca32cb7ceb602
+#+execline.6c0015cfabf6f584cae445babbef047825036a6aeee8e8c6c871e72ffaec3dfd
+#+s6.b18fdf1615dd798baa73249e1a7430663ff2f5f3d371c1e98c09e203b7343cac
+#+s6-rc.2fde1e944c3af08b844ab925bf7619557868e4b28a0eb75e9b65acd0a48d22e7
+#+s6-portable-utils.a90109e5c7600970ca72af1335ca07aad6b1b044e3ddac48d91222471e08c2b5
+#+s6-linux-utils.2861ec0c9a2e6085aaebc07d20cb49c9c54c6511e7879c1d079d115c0198e35d
+#+s6-linux-init.bb3502f93d9accf8f005706a6f09f6e9439e64ad2f73cc80a076ebe7dbe9b542
+#+mdevd.a460c5b630ce5aa87601319a6663a71e86d4cb3b8e7ee55b722574621ca5aaad
+#+s6-dns.494cf73b6ae89aa7e09ea7ba86f35284d02692e9cdb7b5c942caa5cdc1c31e70
+#+libressl.226bf1bb8a711bf00afe7d8c11d1336563883c8b64ddb7dcab7623935c9c6538
+#+s6-networking.5509be97bdfed8a90ccd322720b157f09c30f80114458b9539b3a9fa8234e153
+#+zsh.58b6fe827e616e7c5c8ee9509345ee8af3b6e554fc5eec3f4d2c0bd57a7271b7
+#+pthbs-banginstall.a9ddeb71ceb295a94adddbcc5a9594875e9cc23c46e641f52fc85f8612ea3dcc
+#+aat.7b99ea17519b070d75e112bf642178489362d4a7b765b264eb0d9bc07648c1ac
+#+confz.7932d526338a0c5e8572c6e42f9fba379903ac525746d4e9030039a1160d838e
+#+containers.ebcfae0cfe0c6ea61c6eb156e5de0936e179c0d8aa20d2806c292d3c06d5b5b4
+#+fileset.6b3e7e2768e83fd75ab2b052cfab37dd0c1616d29331edd82018aa4800b36988
+#+logincaps.9405204dd8fd882c77876c05e1d64b470765985f55b8c901b3e34efb74c2ada2
+#+snaprep.41c94b7d7a29c1d664f951c9b2718caf9083f5242772d3b3233ad37ac2ecf81e
+#+curl.55655ec26c265db43870c99c4706f480baca5926d2f45332ed473b006e897965
+#+git.e5319e4d799752e01a9fb98817312112dc1a6e0fe56ad028f4861d9098f5f33b
+#+xbps.4cea29f7454d39ea99f253e62bcd3d5de1ea7b55074796200c108fb47567bea1
+#+apk-tools.6a1ed74bff7f1626e714d28a627438bcaa8dc1a54b770f5e6d96f8077d51be61
+#+getent.1b1e736e986ade0b37cfc4b108106c19fdbb8029f95cb63e358dc30f233e4853
+#+getconf.bd17f5d96474cf19fc1dfc65f6e3a913ecdeec46703131e6dec3377a7e78031e
+#+iconv.1407950c4a70d1e7bdb3f962ba98c83357e745c9a77ce59a2711d3731fbf236b
+#+libcap.fd034245ba020006eaef433e6fef35f06696e295b8b2d376f5b50a59612b568e
+#+applyuidgid-caps.de46e709528c69185aacb856bd68328518b6cdb34b83b900547b44fd42e8cab9
+#+ccx-utils.7223389a6f8e07e3b1608c8d4687188ea79249a7803a4077be0ba4a17de71ecf
+#+user-env.8bf32bf6613fbac80d76b14eb92f9bd7a819c4d34b746d0c5c34d8e462d0488f
+#+strace.75af0b4d6432c56d79d535ff498ffa39a34e62df680d9175ac44a0fe55861386
+#+mlog.04beb73f9b725aee7a22c929b5ac1f4847c3e8ca527330b95b5019ec24eba150
+#+findutils.fb6a799f6323a2489070e91f41a409ba056a58d5e28ecfc72286befbb9d764ee
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+nvi.028c28637bf8469bc6c928a53383390ed3443667003bd739d56309ea971ce91a
+#+squashfs-tools.589b24925728e383b788486279b272a5b403e5cbb985da9c9a238fbbe977bcfc
+#+mandoc.2a930c58658fbe9a7c9b3c4212a70e13fb362b1158144884deaca64de8439141
+#+tinyssh.ad4b4f88f97fb974420ac16553bdc989cd88a8393c66d1427222ed09a61eb322+
\ 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.b26c8d9933bd6ec4e66cfebc19dc46516218804b500835de8de55c00438d7899-
\ No newline at end of file
+#+linux-qemu-guest.eca903c48f1434212764b1b251e81b5517500b4dea90099d0dd5ea562e1f56c8+
\ 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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+libarchive.367caa901f1d746b4bab8e6151140d2096041375851f61f0bf19f215484eff1a
-#+libressl.81c01c5ea3583a370cae043d1853fc630d0a5f4a86ade228a230cbb361854da8
-#+pkgconf-pkg-config.4dbe0a0c4f26f5314d8ae812ef60a36d2712ab219cf7cfc640dc356f2244ab3a
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+libarchive.39508d02cca7ef5ffb449213b269b2cd1c72c0e477dcd086341851a97da71216
+#+libressl.226bf1bb8a711bf00afe7d8c11d1336563883c8b64ddb7dcab7623935c9c6538
+#+pkgconf-pkg-config.2fa2de99392a4945a4240fc66672dac11fc37e407f5cfe1fd17ad20a422ce220
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+m4.39ec04fbe9090fa1c5e29e847ee230f5b2001ca4d2261611d885328f50b614cd
-#+netbsd-curses.957f8d6eddd8ced3a13f77e134a770dad8e485d5124b74731c50181ec1728298
-#+libbsd.4003849f53f9441e674d592f9262a3e40dd6e94be39a57fc0fa9e20f96b79414
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+m4.d87becddb34bfcc9570a150218e9c04f0b11fda5a1947732878a514f7b9af268
+#+netbsd-curses.d3a35e9679b89711abfe52fd0b045b76a652ad0f7712aa8236e7ef9c89ddfc4c
+#+libbsd.526573d44b7450644dc4e51620e997f1eac210c8fa77f1a18ad80af9fd180846
 #@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.5d16c5c017e8eeac281294e0ac69442755cf42c625ae6f40f2bf3ae74f6842a5
-#+busybox-bzip2.8a6bb8d23404771d7a243b175e64bae969563473c1c6cbd6445e079f3eb2dac6
-#+busybox-gzip.28ce344bf19b8047ffeb174db85818ccbe190f276a9ef197f5d55c9e9934edc6
-#+busybox-lzop.e20da2b7855d835a7ed66486f2d3a363b7f02ab00c27e5a02b5ea3d7bf4a33aa
-#+busybox-unzip.bb6893c6deae628cd503eb7c6dd7ce27aee86bb9c2f84b827204c672ca0411d9
-#+busybox-xz.a7939f9eba3eb9f76a3bce9818088fe70caea8fda949964b01d3f360e9f7fae3
-#+busybox-cpio.8004db569ef1daaa2967831febea72638c4c7058f8e268d4cfeae2c968fe060b
-#+busybox-dpkg.9d12b40297dde1952df2e1e5a66a7427b18ccb67ee05083989e3cf7634d0982d
-#+busybox-rpm.3e19366e07df8047c9bd886e8eaeabd5171117fd71a7def67a4b9449e02b5e8f
-#+busybox-tar.d295a68237d0ce5b8a17063a5f5d78d682942102d6cfcf05ea248b6fce0b9416
-#+busybox-ed.4bd094719e240067f325dcffdc7ac3230cab9b1b0f739ffd72b735141a743c83
-#+busybox-sed.b2663748afb404292332e7a076c9596cecc0405e06124da76ff761fc415077c0
-#+busybox-vi.c0d7e3eb4b16287e9c1bdd56f71b4fd0ff78f77bd1e0b0b160559b640d87e165
-#+busybox-xxd.290366cbe7f259cedbedffb947fd0a9c07e09308f8938a911e75ffd6bfad392a
-#+busybox-process-extra.9795d9b9e4c2f68f1f1bccc1a94be1e78e606cdef199189ae295a5087840e311
-#+busybox-procps.7b50b662618f5a14fdbbcec74757cd3c53eb9f2d65a90d0ffd5013f34a3d3556
-#+busybox-psmisc.bcadd4d2d9d4c07f773445666708d107647c5ef96b4714bfcc0e228872137a3a
-#+busybox-ash.e3b961cf7aee721a0be87bd241f8eafefa2983003b88092fb09b2032f36c8cb5
-#+busybox-bc.d6f363896baf1dbe865840027038a1d4e2bdc01d91a9a45d37b9a5fc4cb510cd
-#+busybox-coreutils.1b434de31b7ae5eb1c7f4d6ab62d9cdecbe872e9a786d3b330f147a21371cc91
-#+busybox-coreutils-extra.c42d316f5cc11a05e64efd565561127e7df7b0ae2b782d7d5b390200943010b0
-#+busybox-daemontools.d5ed8dffe86e5f493ac61e2409443654dc6d7b0035cb813c786e0039dfd1fdd1
-#+busybox-grep.6faa5dc5014c48b0e14a58e5a68cd65816b59974e4d29f238a2bd426f92aaa55
-#+busybox-misc.91fd792f85917dca6881e2638c9f9c4891f8d971a50b6b88f00f0b56d74877fc
-#+busybox-sh.5a08a8a6dd1fe6bf78e7dc7d2ea31302b5ffe509e2d65ec8a4b2fcd5186227eb
-#+busybox-util-linux-unpriv.7c12d06944fc8721439f2d621d02175f0e5b42ac769af9106a8fe26602b60bdc
-#+busybox-findutils.04f4b13345183056d97b799c3b5994f2d6d66e83ea07c30ced6b1e746ca40e21
-#+nawk.1c82b321aa17fcd1f5fad4960fa962ff2bddd1641c0a7855ae19173ac3b8ab2d
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-#+gnu-make.7d7509800b3f13c866f7690351b61c6c07379996626f3cadc602465cc33fc4b7
-#+busybox-diffutils.20022334c1022e72f78ee6d16a0e9b70f1a152d1a9ae39e248bb2ba5832aa090
+#+busybox.64c893c1dd92fbbef98ef471d7a90d4afb9592b60ba1bec4ee09f427b3ccd9d0
+#+busybox-bzip2.84c8200f5a5813ea6934dfd40b844169ff246b12c162e5ab2dd4aac59e7b50da
+#+busybox-gzip.825bc2afa004111508cf1284fdd6fa1fe684ea1ba8f2cb2fa9f6d8276ceb62a2
+#+busybox-lzop.1bd06559b9ae6d00ee403e53a33c16e6fc4f3a424bc76ae694bef6e6de914b86
+#+busybox-unzip.b73e529991ca570eea6627446e1d76d33a953f9e14dba01e2d199cb17a5fb4d9
+#+busybox-xz.f45acb7e1cb7e7eb45665e238373025b2c74d7ad63537a6b66bc01189174e1ad
+#+busybox-cpio.b489722b077766532db0d95223f88f6c87549895b2155fb29800866e2cbf48f7
+#+busybox-dpkg.6c2ab393c9ec286d1b9ed9e69ca0b745d1f4803ad1a3e7971b7a19660b1d06f8
+#+busybox-rpm.e8b4f47e80adc7b5764c4f3fb51fb0d53304c5a3378f45b8dd29738a6b942b08
+#+busybox-tar.73166c0d5bc0363671291f1e67b0364f8ead10e008d1e16bd67e25e564a6f910
+#+busybox-ed.ccd9c783ac64e4274c7ecb4120aa91f7f25944c5eaedbe7778b53e0f25b18c08
+#+busybox-sed.7b1f1b62560a20dd02fc11c6d87429b3da0245d3ef9681e5d2146af00a58929e
+#+busybox-vi.e101e1c2149531b11af3e10acc97e3a94f99fb9b2515bd2bed29085802519a0e
+#+busybox-xxd.bffd208c27939b1827540fa7dafdcfbc00faab9b59fbfbedaa3d84e56be3cea7
+#+busybox-process-extra.20a4d9edf75f9c148b687fbfba8697f35ba19af907d2ab1d0cfbdfb9b939f572
+#+busybox-procps.9e64447555c6e2d7c812d296936b58e5e009f976143a9b7504460999e7c15007
+#+busybox-psmisc.4d63d739697526f01e10ba178c70c3938e60f45f1e13373a974958df8cd7691a
+#+busybox-ash.d8f5ff1ba3990171b5286d1a9b7f6c6968167e4eebe6e2ea61ad3533863eb64f
+#+busybox-bc.03d261e2d253a3ad197acac011bb35625f4b39d1a96652ed22c309f6120005ed
+#+busybox-coreutils.6cea7c9f2e6fedeb305c86b8bee4640f786be2d03c2104738b416ecda5abe085
+#+busybox-coreutils-extra.c61584fd0e45bab812e07f7c1c7993794fb5717856ae51680762bdd4a4f946b1
+#+busybox-daemontools.1569e0dcb3ea09e9d86a6d31139815e31495c572db42d146a7b4a8f37b25ce6b
+#+busybox-grep.526750f11d57378c8f31d8233093561abbc07dbd1a4e9d99b309265f47f4b296
+#+busybox-misc.c5a380791d40d185cdcc78019a4d03b954ecfa3536eb46aba5e414b94c701a58
+#+busybox-sh.12931293e8ca13ae2d3f43434e3fb3a349efb0958fc46d68b49bfc1bfebdbbe5
+#+busybox-util-linux-unpriv.26ed77a83d22c62b826838b9ca8be8717b29b1fd0126ab11cbe43b4236169af1
+#+busybox-findutils.6c7d8e46b59c3b830c58ade056d6e765cc134b58ca0c8959b61868056ac9687d
+#+nawk.379ec722db2ed0b547511281ca67a3688d08de1ad1c4140e81d298c7e80f7dc7
+#+musl-cross-make.1c32fb29503f199874372113b62078421bdd092f5a067554b2fa6bfe15c23714
+#+gnu-make.9e9bcb05bc1d908e2a7015af2edceba408955d8b7c48da367ddf008532c39f87
+#+busybox-diffutils.52ce950c0b73aa88e498e973f870c9a1164c5848a17a2b48aa2efff461498ee8
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+zsh.c6fa30dd50149febee90db3be2fe3e6bc4a845fc3ac0a9d08eb98dcd42eafffb
-#+pthbs-banginstall.95b17f999d91f4e7d3dd8c9d215fe646456df7d7fa9d5d346f9fe9cfa154c88e
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+zsh.65d601fbc4a749bb977ee7ccbe517020bcbdfe61fd5504b5440421f95da35a77
+#+pthbs-banginstall.3b3f025e00f21ba563b61728501c9c6055204176fbc1342049a9cce5e1f4b914
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+patch.4b17ba73415945930feb5a8c33383d1bc664528c5de906279d913a178fc51a34
-#+libressl.730f7171f4b481fe74648722fd47bd4f1e947f3a69205d218fc6a5d862c9b872
-#+zstd.e81207b4cc9c549c91cb86fa138ac828146db92cd4b9121953d814e98dd45430
-#+pkgconf-pkg-config.be6ee070c4ac4c7b49e88b8b278433f87977325548cd8dc216b43bcd3583fc2f
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+patch.344b6ea08e2a4014a6ef6279ea19fe8baed234e3d5702f0663b29be408a28a4f
+#+libressl.f5c0e0ce668f88d594a7c65d466b5e2a04a14d9c1f50171d1c545a284bf5a6c0
+#+zstd.cf85bfdc564e415c9bb92168c0c87363bbb1d93b08116e1337a3dd1678523052
+#+pkgconf-pkg-config.7ee8c130cacd4c651ebe6108af8aca3c7efd925aab794ada3b68a3525682a5cd
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+skalibs.01d66a08679c552412188a2d7009c78274a735054bcb4fb048d2596a95e5e822
-#+libcap.122274cf23c4be84b3bc767ad2011b57b9ee56d23213021cb33dc42c17a9a492
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+skalibs.5d72ca2067512220a1dc84af06e0f0bd1d48a95690f718f40b3dec9d502721f6
+#+libcap.a9e2cbdb93b6127674b9067f85482cc2e0ac34a58d783e6a8a6f238443957b72
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+m4.38a87b80b0c591e69af79e6c2802927de15ff689f0adb75f9c7d954f72d0dc78
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+m4.28318b78ba2f3660a0f3aef5d4e29cad2eb99ea39dabfb21d0452ce6fb5bfcf1
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+m4.38a87b80b0c591e69af79e6c2802927de15ff689f0adb75f9c7d954f72d0dc78
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+m4.28318b78ba2f3660a0f3aef5d4e29cad2eb99ea39dabfb21d0452ce6fb5bfcf1
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
 #+nawk.f693cc9a360afa00381350243fad82275ec5781c1916597df5ee0072912dea37
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+m4.38a87b80b0c591e69af79e6c2802927de15ff689f0adb75f9c7d954f72d0dc78
-#+flex.1d3678d5160eeee569843ad18b19e75fee20ffbbc8fca931bdded2854cbb0eb9
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+m4.28318b78ba2f3660a0f3aef5d4e29cad2eb99ea39dabfb21d0452ce6fb5bfcf1
+#+flex.34fe28b384e691fe56db9c24d06b66a1c1cc80ef86538aba64eecc5949cc823a
 #@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.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
 #+gnu-make.411b4e10d12f074a58a97e9ace0752bfc91edd828e78415c69afd0d71d70b507
 #+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
 #@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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/ca-certificates-wip-donotuse b/variants/root-x86_64/ca-certificates-wip-donotuse
@@ -1,33 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+certdata2pem.344b6972c092b238c0e9d404375944096024b65072b62a939a91f57cd13f068d
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+certdata2pem.92ca508dbe5808203b377bda69fc1c2914d7a969e1a3a5b69d1616f60d1e5974
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+skalibs.01d66a08679c552412188a2d7009c78274a735054bcb4fb048d2596a95e5e822
-#+s6.970ebd231d7a4744f8658f1ea1da226a292dca1c602cb875bc48cf6550c41860
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+skalibs.5d72ca2067512220a1dc84af06e0f0bd1d48a95690f718f40b3dec9d502721f6
+#+s6.9cffebc9a518b26826266f23956e620fc924e84c2881fa730110d2f0137beb78
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+zsh.c6fa30dd50149febee90db3be2fe3e6bc4a845fc3ac0a9d08eb98dcd42eafffb
-#+pthbs-banginstall.95b17f999d91f4e7d3dd8c9d215fe646456df7d7fa9d5d346f9fe9cfa154c88e
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+zsh.65d601fbc4a749bb977ee7ccbe517020bcbdfe61fd5504b5440421f95da35a77
+#+pthbs-banginstall.3b3f025e00f21ba563b61728501c9c6055204176fbc1342049a9cce5e1f4b914
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-dosfstools.e7e96a82c639120ce19b4ad0aefac00473ae9f9ece8ec91253f4df819aebc22b
-#+busybox-e2fsprogs.c86d2e956c5b72327914920bb3614c3e3329c7e248070cd9345e91d1b272ce77
-#+busybox-iproute2.536ad1a3df102370378566b14f6620e0549c998d898ddf2acab297d0af3255f0
-#+busybox-iputils.6ca30c7ef168e77615c0711114b6dfdae8744dc7e4468eae90bed8ba55d69486
-#+busybox-net-misc.af3f560d254e759c782a8e40e3ad266b14a3fdda794cfd2d912f1339df3000fb
-#+busybox-net-tools.fde3f542c260f3fd286748bc0b734fd29421285531fa3dae1072403f87637126
-#+busybox-traceroute.0991f711f01e83e4023ca6671800a884027c36c48d36a61bc0105d8531abc803
-#+busybox-wget.c9de635f990672a1b56d40e013e1f5e1521e3f641dfbcaa4d5bb8f209a5da952
-#+busybox-chpst.f06035f49aa6e9d72ff7eeef8b15e9d2b14f463ceb11f6af97fbed8fb3993141
-#+busybox-console.83cc80a1bc0805ae769cec8f96dba7b215d453704281eafdd130af3ac3c24ba5
-#+busybox-getty.a867584bdfea68c20b28aa609d159e3a6cbcd3344dc64ecafc9cb6089c7db2b8
-#+busybox-i2c-tools.753db33037b6861f955fde4e99dadf060020ab8f88f3415d9fe3d6716afc78ff
-#+busybox-linux-extra.45d50567c73529b34de5f1a259b288bb4323a75bc774db337b5298a34e3826bb
-#+busybox-mtd-utils.3c833784c1916515a332f34abd988c937b337e7c79e574103751f6031bd2f576
-#+busybox-shadow.1a7afbd3c1545be4e6300ca1399bbefc90bd294ba6d25e699e8ba18743c3614f
-#+busybox-su.6ba27182e1a0fb5c901818f37cdd3735553e026104756a4bc33b945e5ae7bd47
-#+busybox-util-linux-priv.6ebeef8759613ab60a08f5d18d5da5e4294da086d2cac5ccd4f79bb6b80ccb3c
-#+busybox-logging.e3eba2a127bb0dcd8fd74553766a108ca60711dfbdfec56da3de7ec792b9188e
-#+busybox-cron.15f801c9173b4ccbee5d8ce3095e9c484dafeafc2a468d78ecc677da7f8ce323
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+busybox-login.ca23b1255b7491985b71e9ea95f8e788c61acd13f7ef95b73f88ed37f8bac18c
-#+execline.d963c1317b79d4bae96a3445edb8b9cbe87f759e8056d4ab38a9f38679f35309
-#+s6.970ebd231d7a4744f8658f1ea1da226a292dca1c602cb875bc48cf6550c41860
-#+ccx-utils.1b32dd5e4162af2d18026dd192829f8cb000f9e4720e3e8f7249c5b7841836a0
-#+applyuidgid-caps.b34de250aeaa0ec73b9c7f9d3101ff422ccd3bc44389aad2a0d49be7fd01babf
-#+easyseccomp.14805cda53c0df8a42f208b231a23f0fe73fcb72845cb3cf9a1523b913e0faa8
-#+mlog.e8bf126c4163721a0ad3de90da23dc5c41db5e81302c57241f48e9673b02aa5a
-#+abduco.b09ad0d56ba698900ecb392501b562c3cdb1b439cf2b50116466987f1464e086
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-dosfstools.c8a6cc570700401ec04083e03528be62f509b3f012318c8695e53ebd71e2d9dc
+#+busybox-e2fsprogs.d7ad8dfe278a1df7dc09809b12fe5ca3bfc8d5111d072400a0354cc58e1ca4ec
+#+busybox-iproute2.b89ca8cd2e52742249e7333a31781f4ab8d65bc1a6f96f9787232ae0f9b2445a
+#+busybox-iputils.d6673af0836249054af88b34b09d019518441b7c4726ba499e7149bdc67fa170
+#+busybox-net-misc.eb36c8a47d4f5bc64b470efdd7ee2e53fd62ef2f997d5e4adc37fc843457d78c
+#+busybox-net-tools.a99a761cb56648fbba5f32aedbb9083e76c3fbea9a87ed59df2e82ba5465f3e7
+#+busybox-traceroute.366e1b435e86543f56572d0d5bb79ba53a5a92c684cb3cc93cd9de0a4d5edf71
+#+busybox-wget.a6f7d54f195c28d53728a120a7d1b61e91c5dfc23d26c3ee2fb5aa025e3262bf
+#+busybox-chpst.0df8ecd7905843a0e5515601dcd00723e0b55710706d0241ced309307ef84cee
+#+busybox-console.44d9d593c8f62237919a7d4c04d631d70937cfa9fc5d27fcdd3e7fad16c28cfd
+#+busybox-getty.e09ee3b7215bd50845a232cde7138b98dacd9bfa687d4fac780b0bef08be979a
+#+busybox-i2c-tools.866c066986b22c3b541cc45a648eda608b0f94a10428caefd21dc05776b23c47
+#+busybox-linux-extra.6b5d1707044961c16de2f866a53b4c1efcc60c788a60b68e3328f93ef4fd5a33
+#+busybox-mtd-utils.65395d9e1c0f0792a59fb713e3aebdd27e85307eed29d9d397b9132fc7efb053
+#+busybox-shadow.1e3dc117a129fd93449a98009030e17a4350a62b9918ddf1a7358ba821e8357b
+#+busybox-su.4f5db2b6629fd8c4f6e1668e0e6c58962747c882ee8db4031d91f69fcec892f0
+#+busybox-util-linux-priv.3f582b2110ab99dfb8cda92d90fa9f3ff2040db3a906bdc92a40737396a89a85
+#+busybox-logging.3240660bfa6e394cf14579681c9d20e30b7963cef1e6bdf4a8600f9f769a0de4
+#+busybox-cron.f4612b0a1c37b651c0f058da892228522ae2d8a0681dcc991ffaf37cb1cbe044
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+busybox-login.cb4beb42b06f62c9712ee374407275cbcadc48061787b48f0ebfa9f87d021b8f
+#+execline.85cc7c0d2321980cb1e745b91195ac39cc867bcc8a5dbde79ecf983a746fc4e0
+#+s6.9cffebc9a518b26826266f23956e620fc924e84c2881fa730110d2f0137beb78
+#+ccx-utils.21d2a71da5cad3e4247f035a5c27a9b49fba5110aa0402ef6faebc1a085827bb
+#+applyuidgid-caps.fe72e7cd6fb25b8d8ebbc750cefe20593f6f8fe6d5c0997bf9a38c2dfb19399d
+#+easyseccomp.147485b533931844433843a8f5f23b5a35daaf240104afddfcec4ff7d8edc57e
+#+mlog.f9175803da0d477b1fe12dc239920d2bd388eff9ae29d287501bdf921e120774
+#+abduco.12ae6d87d36f2f994f201561854ae6c728a30b8d1f533b19455af2dedcb4b3cb
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+zsh.c6fa30dd50149febee90db3be2fe3e6bc4a845fc3ac0a9d08eb98dcd42eafffb
-#+pthbs-banginstall.95b17f999d91f4e7d3dd8c9d215fe646456df7d7fa9d5d346f9fe9cfa154c88e
-#+execline.d963c1317b79d4bae96a3445edb8b9cbe87f759e8056d4ab38a9f38679f35309
-#+alpine-keys.abe922cc255783bd71a46a38a5c1d0eca646abe269fced16f1add1bde273b1c6
-#+apk-tools.034f700ee37431d77eb0aa1838442bc71cac87b3e2b377f1906b2e716321af43
-#+xbps.6bb74b636979c06c4ad477b0eef8c10952acdbd53a5644a77e529b8f2edbdf03
-#+container-bin-image.cde49626aae0fafdf363158ffe43f0dde3ca71978ff37e710e0f54cfedae0497
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+zsh.65d601fbc4a749bb977ee7ccbe517020bcbdfe61fd5504b5440421f95da35a77
+#+pthbs-banginstall.3b3f025e00f21ba563b61728501c9c6055204176fbc1342049a9cce5e1f4b914
+#+execline.85cc7c0d2321980cb1e745b91195ac39cc867bcc8a5dbde79ecf983a746fc4e0
+#+alpine-keys.1e0f821566b7286173278fae03860f505ecb2dd481abb44eb143a548a0d61645
+#+apk-tools.f4b9c2e0da859462f1ae72f7085ec35784024220468e1f835f299159cc638f96
+#+xbps.611e82716cc0bdbe5d354dec7e0673ed15284de366ce0e2644859381f62d1374
+#+container-bin-image.a598591965a38e111b84354de37095fcbe07ce74dea7175a9f20d3604ac135e3
 #@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.034f700ee37431d77eb0aa1838442bc71cac87b3e2b377f1906b2e716321af43/command/apk.static' "${dest}/deps/command/"
-ln -sf '/versions/xbps.6bb74b636979c06c4ad477b0eef8c10952acdbd53a5644a77e529b8f2edbdf03/command/xbps-install.static' "${dest}/deps/command/"
+ln -sf '/versions/apk-tools.f4b9c2e0da859462f1ae72f7085ec35784024220468e1f835f299159cc638f96/command/apk.static' "${dest}/deps/command/"
+ln -sf '/versions/xbps.611e82716cc0bdbe5d354dec7e0673ed15284de366ce0e2644859381f62d1374/command/xbps-install.static' "${dest}/deps/command/"
 
-for f in '/versions/alpine-keys.abe922cc255783bd71a46a38a5c1d0eca646abe269fced16f1add1bde273b1c6'/keys/alpine/*/*; do
+for f in '/versions/alpine-keys.1e0f821566b7286173278fae03860f505ecb2dd481abb44eb143a548a0d61645'/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.abe922cc255783bd71a46a38a5c1d0eca646abe269fced16
 done
  
 mkdir -p "${dest}/deps/keys/void"
-for f in '/versions/xbps.6bb74b636979c06c4ad477b0eef8c10952acdbd53a5644a77e529b8f2edbdf03'/keys/void/*; do
+for f in '/versions/xbps.611e82716cc0bdbe5d354dec7e0673ed15284de366ce0e2644859381f62d1374'/keys/void/*; do
 	ln -sf "$f" "${dest}/deps/keys/void/"
 done
 
-test -d '/versions/container-bin-image.cde49626aae0fafdf363158ffe43f0dde3ca71978ff37e710e0f54cfedae0497/container-bin-image'
-test -f '/versions/container-bin-image.cde49626aae0fafdf363158ffe43f0dde3ca71978ff37e710e0f54cfedae0497/container-bin-image/if'
-ln -sf '/versions/container-bin-image.cde49626aae0fafdf363158ffe43f0dde3ca71978ff37e710e0f54cfedae0497/container-bin-image' "${dest}/deps/"
+test -d '/versions/container-bin-image.a598591965a38e111b84354de37095fcbe07ce74dea7175a9f20d3604ac135e3/container-bin-image'
+test -f '/versions/container-bin-image.a598591965a38e111b84354de37095fcbe07ce74dea7175a9f20d3604ac135e3/container-bin-image/if'
+ln -sf '/versions/container-bin-image.a598591965a38e111b84354de37095fcbe07ce74dea7175a9f20d3604ac135e3/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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-dosfstools.e7e96a82c639120ce19b4ad0aefac00473ae9f9ece8ec91253f4df819aebc22b
-#+busybox-e2fsprogs.c86d2e956c5b72327914920bb3614c3e3329c7e248070cd9345e91d1b272ce77
-#+busybox-iproute2.536ad1a3df102370378566b14f6620e0549c998d898ddf2acab297d0af3255f0
-#+busybox-iputils.6ca30c7ef168e77615c0711114b6dfdae8744dc7e4468eae90bed8ba55d69486
-#+busybox-net-misc.af3f560d254e759c782a8e40e3ad266b14a3fdda794cfd2d912f1339df3000fb
-#+busybox-net-tools.fde3f542c260f3fd286748bc0b734fd29421285531fa3dae1072403f87637126
-#+busybox-traceroute.0991f711f01e83e4023ca6671800a884027c36c48d36a61bc0105d8531abc803
-#+busybox-wget.c9de635f990672a1b56d40e013e1f5e1521e3f641dfbcaa4d5bb8f209a5da952
-#+busybox-chpst.f06035f49aa6e9d72ff7eeef8b15e9d2b14f463ceb11f6af97fbed8fb3993141
-#+busybox-console.83cc80a1bc0805ae769cec8f96dba7b215d453704281eafdd130af3ac3c24ba5
-#+busybox-getty.a867584bdfea68c20b28aa609d159e3a6cbcd3344dc64ecafc9cb6089c7db2b8
-#+busybox-i2c-tools.753db33037b6861f955fde4e99dadf060020ab8f88f3415d9fe3d6716afc78ff
-#+busybox-linux-extra.45d50567c73529b34de5f1a259b288bb4323a75bc774db337b5298a34e3826bb
-#+busybox-mtd-utils.3c833784c1916515a332f34abd988c937b337e7c79e574103751f6031bd2f576
-#+busybox-shadow.1a7afbd3c1545be4e6300ca1399bbefc90bd294ba6d25e699e8ba18743c3614f
-#+busybox-su.6ba27182e1a0fb5c901818f37cdd3735553e026104756a4bc33b945e5ae7bd47
-#+busybox-util-linux-priv.6ebeef8759613ab60a08f5d18d5da5e4294da086d2cac5ccd4f79bb6b80ccb3c
-#+busybox-logging.e3eba2a127bb0dcd8fd74553766a108ca60711dfbdfec56da3de7ec792b9188e
-#+busybox-cron.15f801c9173b4ccbee5d8ce3095e9c484dafeafc2a468d78ecc677da7f8ce323
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+execline.d963c1317b79d4bae96a3445edb8b9cbe87f759e8056d4ab38a9f38679f35309
-#+s6.970ebd231d7a4744f8658f1ea1da226a292dca1c602cb875bc48cf6550c41860
-#+s6-portable-utils.4edab8efd749332207c049c847dc15c5b600c12d45cc84294b1ac6c874d256aa
-#+s6-linux-utils.ea042eba3759068d6e4452431b2685c4f5148deaea92f452981f62b01cb606f8
-#+zsh.c6fa30dd50149febee90db3be2fe3e6bc4a845fc3ac0a9d08eb98dcd42eafffb
-#+confz.ac17202cbad6ff803a2970796bbe064651194e36256bbc6894dbca79c69b6803
-#+containers.c1d02b082615e15c2feb03d6699d6477efe785a008628b5667cba973bb8caad7
-#+xbps.6bb74b636979c06c4ad477b0eef8c10952acdbd53a5644a77e529b8f2edbdf03
-#+zstd.e81207b4cc9c549c91cb86fa138ac828146db92cd4b9121953d814e98dd45430
-#+apk-tools.034f700ee37431d77eb0aa1838442bc71cac87b3e2b377f1906b2e716321af43
-#+alpine-keys.abe922cc255783bd71a46a38a5c1d0eca646abe269fced16f1add1bde273b1c6
-#+getent.007e4cb060a1904aa50daa0ce66587640b4c16f816c7924a861a5e9f9ba11210
-#+fileset.09f8a20d60de58f915dffcc0cfb62358ae2daf46426755c69ce8d038624db74f
-#+ccx-utils.1b32dd5e4162af2d18026dd192829f8cb000f9e4720e3e8f7249c5b7841836a0
-#+easyseccomp.14805cda53c0df8a42f208b231a23f0fe73fcb72845cb3cf9a1523b913e0faa8
-#+findutils.781947fa469b78ae5279f7676b2bb9e31f710b7f0ff3a1ddea07d587701091c4
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808-
\ No newline at end of file
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-dosfstools.c8a6cc570700401ec04083e03528be62f509b3f012318c8695e53ebd71e2d9dc
+#+busybox-e2fsprogs.d7ad8dfe278a1df7dc09809b12fe5ca3bfc8d5111d072400a0354cc58e1ca4ec
+#+busybox-iproute2.b89ca8cd2e52742249e7333a31781f4ab8d65bc1a6f96f9787232ae0f9b2445a
+#+busybox-iputils.d6673af0836249054af88b34b09d019518441b7c4726ba499e7149bdc67fa170
+#+busybox-net-misc.eb36c8a47d4f5bc64b470efdd7ee2e53fd62ef2f997d5e4adc37fc843457d78c
+#+busybox-net-tools.a99a761cb56648fbba5f32aedbb9083e76c3fbea9a87ed59df2e82ba5465f3e7
+#+busybox-traceroute.366e1b435e86543f56572d0d5bb79ba53a5a92c684cb3cc93cd9de0a4d5edf71
+#+busybox-wget.a6f7d54f195c28d53728a120a7d1b61e91c5dfc23d26c3ee2fb5aa025e3262bf
+#+busybox-chpst.0df8ecd7905843a0e5515601dcd00723e0b55710706d0241ced309307ef84cee
+#+busybox-console.44d9d593c8f62237919a7d4c04d631d70937cfa9fc5d27fcdd3e7fad16c28cfd
+#+busybox-getty.e09ee3b7215bd50845a232cde7138b98dacd9bfa687d4fac780b0bef08be979a
+#+busybox-i2c-tools.866c066986b22c3b541cc45a648eda608b0f94a10428caefd21dc05776b23c47
+#+busybox-linux-extra.6b5d1707044961c16de2f866a53b4c1efcc60c788a60b68e3328f93ef4fd5a33
+#+busybox-mtd-utils.65395d9e1c0f0792a59fb713e3aebdd27e85307eed29d9d397b9132fc7efb053
+#+busybox-shadow.1e3dc117a129fd93449a98009030e17a4350a62b9918ddf1a7358ba821e8357b
+#+busybox-su.4f5db2b6629fd8c4f6e1668e0e6c58962747c882ee8db4031d91f69fcec892f0
+#+busybox-util-linux-priv.3f582b2110ab99dfb8cda92d90fa9f3ff2040db3a906bdc92a40737396a89a85
+#+busybox-logging.3240660bfa6e394cf14579681c9d20e30b7963cef1e6bdf4a8600f9f769a0de4
+#+busybox-cron.f4612b0a1c37b651c0f058da892228522ae2d8a0681dcc991ffaf37cb1cbe044
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+execline.85cc7c0d2321980cb1e745b91195ac39cc867bcc8a5dbde79ecf983a746fc4e0
+#+s6.9cffebc9a518b26826266f23956e620fc924e84c2881fa730110d2f0137beb78
+#+s6-portable-utils.161e16d5d2b341a2d57cdc65efbbec0b612a1308b595c7a9a9767306bbe69df0
+#+s6-linux-utils.30bfc0b08e9ad986c9c382565da44c3375c4e879df7d82cd3b60addcecb6242e
+#+zsh.65d601fbc4a749bb977ee7ccbe517020bcbdfe61fd5504b5440421f95da35a77
+#+confz.ed578aebf631a3204b1602c5193228d9e1f4706f2a60326cd058468bcaa8e551
+#+containers.d82e02c92525bc3ac2a363701a00369a02197f99415c84f1dfef61131516686e
+#+xbps.611e82716cc0bdbe5d354dec7e0673ed15284de366ce0e2644859381f62d1374
+#+zstd.cf85bfdc564e415c9bb92168c0c87363bbb1d93b08116e1337a3dd1678523052
+#+apk-tools.f4b9c2e0da859462f1ae72f7085ec35784024220468e1f835f299159cc638f96
+#+alpine-keys.1e0f821566b7286173278fae03860f505ecb2dd481abb44eb143a548a0d61645
+#+getent.daf2a010a0f6c1a43d2ad5afff396e20b99c1cb05663798d924e5e93a253aec8
+#+fileset.edb14d89ed04d2d9832915d0023aaa8c9249619e79ab1bcf359e5942a732b618
+#+ccx-utils.21d2a71da5cad3e4247f035a5c27a9b49fba5110aa0402ef6faebc1a085827bb
+#+easyseccomp.147485b533931844433843a8f5f23b5a35daaf240104afddfcec4ff7d8edc57e
+#+findutils.90e39013e744f9b11295b4d009f8a887e4fcc13d378dc99b347611d302377870
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb+
\ 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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+m4.38a87b80b0c591e69af79e6c2802927de15ff689f0adb75f9c7d954f72d0dc78
-#+libressl.730f7171f4b481fe74648722fd47bd4f1e947f3a69205d218fc6a5d862c9b872
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+m4.28318b78ba2f3660a0f3aef5d4e29cad2eb99ea39dabfb21d0452ce6fb5bfcf1
+#+libressl.f5c0e0ce668f88d594a7c65d466b5e2a04a14d9c1f50171d1c545a284bf5a6c0
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-dosfstools.e7e96a82c639120ce19b4ad0aefac00473ae9f9ece8ec91253f4df819aebc22b
-#+busybox-e2fsprogs.c86d2e956c5b72327914920bb3614c3e3329c7e248070cd9345e91d1b272ce77
-#+busybox-iproute2.536ad1a3df102370378566b14f6620e0549c998d898ddf2acab297d0af3255f0
-#+busybox-iputils.6ca30c7ef168e77615c0711114b6dfdae8744dc7e4468eae90bed8ba55d69486
-#+busybox-net-misc.af3f560d254e759c782a8e40e3ad266b14a3fdda794cfd2d912f1339df3000fb
-#+busybox-net-tools.fde3f542c260f3fd286748bc0b734fd29421285531fa3dae1072403f87637126
-#+busybox-traceroute.0991f711f01e83e4023ca6671800a884027c36c48d36a61bc0105d8531abc803
-#+busybox-wget.c9de635f990672a1b56d40e013e1f5e1521e3f641dfbcaa4d5bb8f209a5da952
-#+busybox-chpst.f06035f49aa6e9d72ff7eeef8b15e9d2b14f463ceb11f6af97fbed8fb3993141
-#+busybox-console.83cc80a1bc0805ae769cec8f96dba7b215d453704281eafdd130af3ac3c24ba5
-#+busybox-getty.a867584bdfea68c20b28aa609d159e3a6cbcd3344dc64ecafc9cb6089c7db2b8
-#+busybox-i2c-tools.753db33037b6861f955fde4e99dadf060020ab8f88f3415d9fe3d6716afc78ff
-#+busybox-linux-extra.45d50567c73529b34de5f1a259b288bb4323a75bc774db337b5298a34e3826bb
-#+busybox-mtd-utils.3c833784c1916515a332f34abd988c937b337e7c79e574103751f6031bd2f576
-#+busybox-shadow.1a7afbd3c1545be4e6300ca1399bbefc90bd294ba6d25e699e8ba18743c3614f
-#+busybox-su.6ba27182e1a0fb5c901818f37cdd3735553e026104756a4bc33b945e5ae7bd47
-#+busybox-util-linux-priv.6ebeef8759613ab60a08f5d18d5da5e4294da086d2cac5ccd4f79bb6b80ccb3c
-#+busybox-logging.e3eba2a127bb0dcd8fd74553766a108ca60711dfbdfec56da3de7ec792b9188e
-#+busybox-cron.15f801c9173b4ccbee5d8ce3095e9c484dafeafc2a468d78ecc677da7f8ce323
-#+attr.bd96d480e70972a5df7c8aeb7764eff6e240f14b3eb1f5c9264518e7bb3676ab
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+diffutils.c6a01fe99dbc69a4244c2bda8041e48cdabd3ad2e6ac218f52d272e9970fe900
-#+patch.4b17ba73415945930feb5a8c33383d1bc664528c5de906279d913a178fc51a34
-#+flex.1d3678d5160eeee569843ad18b19e75fee20ffbbc8fca931bdded2854cbb0eb9
-#+bison.decdb705b70b77ca41fc5899990d94dac2d501b4a9be5cbb16e5d500e3698b8d
-#+rsync.722ce21d65643be0a9c878fd7939ab722426612683234301a5d375bd730f4ecf
-#+execline.d963c1317b79d4bae96a3445edb8b9cbe87f759e8056d4ab38a9f38679f35309
-#+s6.970ebd231d7a4744f8658f1ea1da226a292dca1c602cb875bc48cf6550c41860
-#+s6-rc.8082adbebeb3380871bec61abd50d419ca36d080bb9386934ab3fe0f69155abc
-#+s6-portable-utils.4edab8efd749332207c049c847dc15c5b600c12d45cc84294b1ac6c874d256aa
-#+s6-linux-utils.ea042eba3759068d6e4452431b2685c4f5148deaea92f452981f62b01cb606f8
-#+s6-linux-init.a9ea381b85b7b809eb57591fe3b85a825f73f9963efd785048769a1d8af302d7
-#+mdevd.39046ba66db9e8738fe1a7b78762d40f5cf7e0f615bc8be69ede799349d25449
-#+s6-dns.f079ac9da714e06831a6d6e92fbefb898f6860ae9cbfa1e1dce465285acac4f3
-#+libressl.730f7171f4b481fe74648722fd47bd4f1e947f3a69205d218fc6a5d862c9b872
-#+s6-networking.985823000d7538d38f3d60f032d13a691e6d37a4991bed1508a27d590280091a
-#+zsh.c6fa30dd50149febee90db3be2fe3e6bc4a845fc3ac0a9d08eb98dcd42eafffb
-#+pthbs-banginstall.95b17f999d91f4e7d3dd8c9d215fe646456df7d7fa9d5d346f9fe9cfa154c88e
-#+aat.048375e3aab6dd9ff288c7b5ddfc694cffae9dc711001c6bd47a72f5ec839dcf
-#+confz.ac17202cbad6ff803a2970796bbe064651194e36256bbc6894dbca79c69b6803
-#+containers.c1d02b082615e15c2feb03d6699d6477efe785a008628b5667cba973bb8caad7
-#+fileset.09f8a20d60de58f915dffcc0cfb62358ae2daf46426755c69ce8d038624db74f
-#+logincaps.f4a1c183fe0ae318dc8b27a67bb2becf3bf1524ae754b8abaf00b0486fcf2b80
-#+snaprep.1dc067aace6718d566411c7001083da280fd4b9da6117d19ae3ac0b3c7be2e8c
-#+curl.bbbd85518f7e275b7d21992adbd1f5f3b1e91edc0d2bd641155076f8bec15d2d
-#+git.e1b3381e4aa84b1e4e3172e5224dd085fb74e7eeec86e0eca02b4aec3e6dfb1e
-#+xbps.6bb74b636979c06c4ad477b0eef8c10952acdbd53a5644a77e529b8f2edbdf03
-#+apk-tools.034f700ee37431d77eb0aa1838442bc71cac87b3e2b377f1906b2e716321af43
-#+getent.007e4cb060a1904aa50daa0ce66587640b4c16f816c7924a861a5e9f9ba11210
-#+getconf.880ce8afd27608539f556afd47410c03779a95960198ed1f3d6cfa1a701e20f5
-#+iconv.1af5ff995e66cb82f12cda4e95a7e2a4f8eb89f29614e1642e472883b8724a44
-#+libcap.122274cf23c4be84b3bc767ad2011b57b9ee56d23213021cb33dc42c17a9a492
-#+applyuidgid-caps.b34de250aeaa0ec73b9c7f9d3101ff422ccd3bc44389aad2a0d49be7fd01babf
-#+ccx-utils.1b32dd5e4162af2d18026dd192829f8cb000f9e4720e3e8f7249c5b7841836a0
-#+user-env.69ee3dda2d58d0e9c409aadd667c17bcb7bfa825546cbb2d1469767899bac27c
-#+strace.675ef51453416134ef952f8b69c2290916fa2f5a3ca9fc3e70bad9720247cd0c
-#+mlog.e8bf126c4163721a0ad3de90da23dc5c41db5e81302c57241f48e9673b02aa5a
-#+findutils.781947fa469b78ae5279f7676b2bb9e31f710b7f0ff3a1ddea07d587701091c4
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+nvi.c497fa20793a65d73bf37d3df203df922a4f3101cdf9c660af43ade66ab97030
-#+squashfs-tools.07241a65396f6e4c73514df867e762e8e38648deff2fa0eaf473eea4afc68665
-#+mandoc.38850a8445bdfa5ca04c4763eafcdadb026038e6323b37798980b64a7727c264
-#+tinyssh.1398faffed1f87b38911a7ce06625a059b691da70629ddbf258ed85bb0daa367
-#+system-config.5ddc84b64ae06eafa41e93de6f54c7c1aa27fc039d81992692b9ba40eb8b557c
-#+system-config-rc.1292d5ed34b16770c4627b74c75b68de343de76062e8c73cd6632fe6a9cbfc0c
-#+system-config-scripts.4349d1ddaf2ba8e1816d23fb8a0109988eeae7a38235bf1400fc16381e1ee7e3
-#+system-config-init.6e96ad9e58e9f1ce53cafc2d0714df1c4ce792bf9cb1b3a5486045f7b3f47d07
-#+system-config-zsh.91d6720e4e586877eac2d185a8096f87753363b38e2f28257691c59abe6b43e8
-#+busybox-modutils.ec6b4d037ab46ada4552a159a8080917f77dbcfb4ee129b3a52e2cbe2c8308bf-
\ No newline at end of file
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-dosfstools.c8a6cc570700401ec04083e03528be62f509b3f012318c8695e53ebd71e2d9dc
+#+busybox-e2fsprogs.d7ad8dfe278a1df7dc09809b12fe5ca3bfc8d5111d072400a0354cc58e1ca4ec
+#+busybox-iproute2.b89ca8cd2e52742249e7333a31781f4ab8d65bc1a6f96f9787232ae0f9b2445a
+#+busybox-iputils.d6673af0836249054af88b34b09d019518441b7c4726ba499e7149bdc67fa170
+#+busybox-net-misc.eb36c8a47d4f5bc64b470efdd7ee2e53fd62ef2f997d5e4adc37fc843457d78c
+#+busybox-net-tools.a99a761cb56648fbba5f32aedbb9083e76c3fbea9a87ed59df2e82ba5465f3e7
+#+busybox-traceroute.366e1b435e86543f56572d0d5bb79ba53a5a92c684cb3cc93cd9de0a4d5edf71
+#+busybox-wget.a6f7d54f195c28d53728a120a7d1b61e91c5dfc23d26c3ee2fb5aa025e3262bf
+#+busybox-chpst.0df8ecd7905843a0e5515601dcd00723e0b55710706d0241ced309307ef84cee
+#+busybox-console.44d9d593c8f62237919a7d4c04d631d70937cfa9fc5d27fcdd3e7fad16c28cfd
+#+busybox-getty.e09ee3b7215bd50845a232cde7138b98dacd9bfa687d4fac780b0bef08be979a
+#+busybox-i2c-tools.866c066986b22c3b541cc45a648eda608b0f94a10428caefd21dc05776b23c47
+#+busybox-linux-extra.6b5d1707044961c16de2f866a53b4c1efcc60c788a60b68e3328f93ef4fd5a33
+#+busybox-mtd-utils.65395d9e1c0f0792a59fb713e3aebdd27e85307eed29d9d397b9132fc7efb053
+#+busybox-shadow.1e3dc117a129fd93449a98009030e17a4350a62b9918ddf1a7358ba821e8357b
+#+busybox-su.4f5db2b6629fd8c4f6e1668e0e6c58962747c882ee8db4031d91f69fcec892f0
+#+busybox-util-linux-priv.3f582b2110ab99dfb8cda92d90fa9f3ff2040db3a906bdc92a40737396a89a85
+#+busybox-logging.3240660bfa6e394cf14579681c9d20e30b7963cef1e6bdf4a8600f9f769a0de4
+#+busybox-cron.f4612b0a1c37b651c0f058da892228522ae2d8a0681dcc991ffaf37cb1cbe044
+#+attr.5ac38c50ab82191bec2123529926d7d17369e4790e7114a14489807b502f801a
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+diffutils.d572049a256722eee683e5690bbe39272948fa2a357134e6e9d494cf0fdc0938
+#+patch.344b6ea08e2a4014a6ef6279ea19fe8baed234e3d5702f0663b29be408a28a4f
+#+flex.34fe28b384e691fe56db9c24d06b66a1c1cc80ef86538aba64eecc5949cc823a
+#+bison.01d3b98d0b385e5274ca2e31af81d5b06d703373e22d45c7626518771f98c271
+#+rsync.6eb8ec4110251f2382150402df9ea529aa86f82c17e8ee6820255b1c199508b2
+#+execline.85cc7c0d2321980cb1e745b91195ac39cc867bcc8a5dbde79ecf983a746fc4e0
+#+s6.9cffebc9a518b26826266f23956e620fc924e84c2881fa730110d2f0137beb78
+#+s6-rc.b1b1ba4696f3832c6af87ad9f1818d41a2e6b497c2b2eaa16802bdff1594ecc8
+#+s6-portable-utils.161e16d5d2b341a2d57cdc65efbbec0b612a1308b595c7a9a9767306bbe69df0
+#+s6-linux-utils.30bfc0b08e9ad986c9c382565da44c3375c4e879df7d82cd3b60addcecb6242e
+#+s6-linux-init.5412911f6f2e8d2aaee940f5d4317c85950bf8b079e7fdb63ef1b75e25857112
+#+mdevd.6e1fa351cee2ca7ff7df342f571dd632ba6c74c10fac10c7da5dc4b94fc47779
+#+s6-dns.36413157c2fa7bf0585fb9fabdfdaa48cd6a239b36f060fc6bb314a016bf77b6
+#+libressl.f5c0e0ce668f88d594a7c65d466b5e2a04a14d9c1f50171d1c545a284bf5a6c0
+#+s6-networking.bf060085193e7d274c207d7ece2dc1a9fe2a88db1ad521baaa885169f80369a0
+#+zsh.65d601fbc4a749bb977ee7ccbe517020bcbdfe61fd5504b5440421f95da35a77
+#+pthbs-banginstall.3b3f025e00f21ba563b61728501c9c6055204176fbc1342049a9cce5e1f4b914
+#+aat.126e22923377fe33f93b81849e9450975a67d3c57bcad9401ee14df44f01b801
+#+confz.ed578aebf631a3204b1602c5193228d9e1f4706f2a60326cd058468bcaa8e551
+#+containers.d82e02c92525bc3ac2a363701a00369a02197f99415c84f1dfef61131516686e
+#+fileset.edb14d89ed04d2d9832915d0023aaa8c9249619e79ab1bcf359e5942a732b618
+#+logincaps.425ca5899172da45c85f9d1cd3abdc7abdb1728d3d9bac6391ca4aa0cfe93587
+#+snaprep.6ee236a6b194f88b45d2bc263bc000285189e19d42a690621317119c5245c486
+#+curl.d188d8b5e966c8f58df896345a38cd46c5261b88ae838016fd39d96824955fc4
+#+git.398e356788707a30f1eabf725a65625913907f9b564ee23d340ce906d9e53a53
+#+xbps.611e82716cc0bdbe5d354dec7e0673ed15284de366ce0e2644859381f62d1374
+#+apk-tools.f4b9c2e0da859462f1ae72f7085ec35784024220468e1f835f299159cc638f96
+#+getent.daf2a010a0f6c1a43d2ad5afff396e20b99c1cb05663798d924e5e93a253aec8
+#+getconf.03aaed48a23a68d18df71b1c277a2be8d553bfff473a407021f7c5802a64f3d7
+#+iconv.8dfa3309b363c0c01414aaf8e542884902ccd99bfbcbb011c358afb8325eef61
+#+libcap.a9e2cbdb93b6127674b9067f85482cc2e0ac34a58d783e6a8a6f238443957b72
+#+applyuidgid-caps.fe72e7cd6fb25b8d8ebbc750cefe20593f6f8fe6d5c0997bf9a38c2dfb19399d
+#+ccx-utils.21d2a71da5cad3e4247f035a5c27a9b49fba5110aa0402ef6faebc1a085827bb
+#+user-env.a5dd2ecc35c8ce909ad130c7b779f008c0937e7257940e730bd0c30e25f432db
+#+strace.1002ac13393840a0cf1931f9f59310d14eeeb2e90cc3f276c1e1b352dfee57d7
+#+mlog.f9175803da0d477b1fe12dc239920d2bd388eff9ae29d287501bdf921e120774
+#+findutils.90e39013e744f9b11295b4d009f8a887e4fcc13d378dc99b347611d302377870
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+nvi.ad6e31dab2a13b9c547e1fc0181f798143c0adcecef34a3e4ea833e00fd23ea0
+#+squashfs-tools.3d71d4f7b6ec0bea54dc8a493bfd121b007ac9bab1c0b114136917dba31cdacc
+#+mandoc.4c32f4cbe2c4cdc1d0eb68b68dce4cecca0545918aa47f9b5ae2da8c8dd28b29
+#+tinyssh.36c172256072647974113a0ab43b083d7eff47b431ffb9e20bfb2bc6b0333246
+#+system-config.f28c31b9fbc351878943abfa83362d57da9d032d12dace3d0aed874cc964b67d
+#+system-config-rc.c5fb81aa76da3fe78e62d24c0f3da403bd91f8165943dc5a7d221db5f6464216
+#+system-config-scripts.53efdc0dcacb8b84bf16a0e375677a3397ab54402e55735f6278dc5a42a1827d
+#+system-config-init.18d33edd54b2350371ded929d60f5fd4fdaf9e3b78f15051604cc3d06e160ea2
+#+system-config-zsh.676a7510301e642253c88b219ac1d59083b5d5bd5339bcd099cb86cd88dd39b0
+#+busybox-modutils.35c43d4b68ad79e661e3ddfd6637ac6dafee4b0b0bffc5d3a5ac3a447f32d481+
\ 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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+m4.38a87b80b0c591e69af79e6c2802927de15ff689f0adb75f9c7d954f72d0dc78
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+m4.28318b78ba2f3660a0f3aef5d4e29cad2eb99ea39dabfb21d0452ce6fb5bfcf1
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+ocaml.2b401c0ac04a1d73e0068b427734ab510e22f27a2c07ebe99a45474c06284861
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+ocaml.c361713a0e3f409f88c7e2b9d91e57cf2378aa6cfe6f04e76f8f4bfcfd991b1c
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+m4.38a87b80b0c591e69af79e6c2802927de15ff689f0adb75f9c7d954f72d0dc78
-#+patch.4b17ba73415945930feb5a8c33383d1bc664528c5de906279d913a178fc51a34
-#+flex.1d3678d5160eeee569843ad18b19e75fee20ffbbc8fca931bdded2854cbb0eb9
-#+bison.decdb705b70b77ca41fc5899990d94dac2d501b4a9be5cbb16e5d500e3698b8d
-#+libseccomp.0544e10a6f2ebdb5c4ef03a1c94493e7b8ee4f17e54d9cf970898da4028c412b
-#+error-standalone.756666f807bbd9f11f2b671689bf7c854c088693669976398bb0fd3d44c520e9
-#+argp-standalone.395bdcbf91013f157d4bcf6681c6cd221baf323dc8723c26919be18a3e47df02
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+m4.28318b78ba2f3660a0f3aef5d4e29cad2eb99ea39dabfb21d0452ce6fb5bfcf1
+#+patch.344b6ea08e2a4014a6ef6279ea19fe8baed234e3d5702f0663b29be408a28a4f
+#+flex.34fe28b384e691fe56db9c24d06b66a1c1cc80ef86538aba64eecc5949cc823a
+#+bison.01d3b98d0b385e5274ca2e31af81d5b06d703373e22d45c7626518771f98c271
+#+libseccomp.eee46241657c63389c198a5f1f6dce442d1b5c0ab1a6a287f208304044d6f31c
+#+error-standalone.906efa8b7d479b8009aae9520fdce6c9e65ef8f0eea679b08eb4febb35e8a862
+#+argp-standalone.799cea45af620f7ef49662be1a1a48e72e4e3ea10d3ad7b9d6f0b17f80b646b8
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+skalibs.01d66a08679c552412188a2d7009c78274a735054bcb4fb048d2596a95e5e822
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+skalibs.5d72ca2067512220a1dc84af06e0f0bd1d48a95690f718f40b3dec9d502721f6
 #@git:6c0957eb5e8eea2ffada4d7be08286f0e81d0527:execline
 
 
@@ -48,7 +46,7 @@ cd 'execline'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.01d66a08679c552412188a2d7009c78274a735054bcb4fb048d2596a95e5e822/sysdeps' \
+	--with-sysdeps='/versions/skalibs.5d72ca2067512220a1dc84af06e0f0bd1d48a95690f718f40b3dec9d502721f6/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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+zsh.c6fa30dd50149febee90db3be2fe3e6bc4a845fc3ac0a9d08eb98dcd42eafffb
-#+pthbs-banginstall.95b17f999d91f4e7d3dd8c9d215fe646456df7d7fa9d5d346f9fe9cfa154c88e
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+zsh.65d601fbc4a749bb977ee7ccbe517020bcbdfe61fd5504b5440421f95da35a77
+#+pthbs-banginstall.3b3f025e00f21ba563b61728501c9c6055204176fbc1342049a9cce5e1f4b914
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+m4.38a87b80b0c591e69af79e6c2802927de15ff689f0adb75f9c7d954f72d0dc78
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+m4.28318b78ba2f3660a0f3aef5d4e29cad2eb99ea39dabfb21d0452ce6fb5bfcf1
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
 #+nawk.f693cc9a360afa00381350243fad82275ec5781c1916597df5ee0072912dea37
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+m4.38a87b80b0c591e69af79e6c2802927de15ff689f0adb75f9c7d954f72d0dc78
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+m4.28318b78ba2f3660a0f3aef5d4e29cad2eb99ea39dabfb21d0452ce6fb5bfcf1
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+m4.38a87b80b0c591e69af79e6c2802927de15ff689f0adb75f9c7d954f72d0dc78
-#+libressl.730f7171f4b481fe74648722fd47bd4f1e947f3a69205d218fc6a5d862c9b872
-#+curl.bbbd85518f7e275b7d21992adbd1f5f3b1e91edc0d2bd641155076f8bec15d2d
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+m4.28318b78ba2f3660a0f3aef5d4e29cad2eb99ea39dabfb21d0452ce6fb5bfcf1
+#+libressl.f5c0e0ce668f88d594a7c65d466b5e2a04a14d9c1f50171d1c545a284bf5a6c0
+#+curl.d188d8b5e966c8f58df896345a38cd46c5261b88ae838016fd39d96824955fc4
 #@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.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
 #+gnu-make.411b4e10d12f074a58a97e9ace0752bfc91edd828e78415c69afd0d71d70b507
 #+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
 #+nawk.f693cc9a360afa00381350243fad82275ec5781c1916597df5ee0072912dea37
diff --git a/variants/root-x86_64/gperf b/variants/root-x86_64/gperf
@@ -1,38 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+m4.38a87b80b0c591e69af79e6c2802927de15ff689f0adb75f9c7d954f72d0dc78
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+m4.28318b78ba2f3660a0f3aef5d4e29cad2eb99ea39dabfb21d0452ce6fb5bfcf1
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+m4.38a87b80b0c591e69af79e6c2802927de15ff689f0adb75f9c7d954f72d0dc78
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+m4.28318b78ba2f3660a0f3aef5d4e29cad2eb99ea39dabfb21d0452ce6fb5bfcf1
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+m4.38a87b80b0c591e69af79e6c2802927de15ff689f0adb75f9c7d954f72d0dc78
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+m4.28318b78ba2f3660a0f3aef5d4e29cad2eb99ea39dabfb21d0452ce6fb5bfcf1
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+m4.38a87b80b0c591e69af79e6c2802927de15ff689f0adb75f9c7d954f72d0dc78
-#+libmd.de982fc8d6306559e0527ff29538a91d428115f0344aa5ab9e2426c83b1f6fb9
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+m4.28318b78ba2f3660a0f3aef5d4e29cad2eb99ea39dabfb21d0452ce6fb5bfcf1
+#+libmd.af9879bb17854b9e4f2fcaa878d13d7ad51e692cf386088e3e0ef559c775cd68
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+pkgconf-pkg-config.be6ee070c4ac4c7b49e88b8b278433f87977325548cd8dc216b43bcd3583fc2f
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+pkgconf-pkg-config.7ee8c130cacd4c651ebe6108af8aca3c7efd925aab794ada3b68a3525682a5cd
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+m4.38a87b80b0c591e69af79e6c2802927de15ff689f0adb75f9c7d954f72d0dc78
-#+flex.1d3678d5160eeee569843ad18b19e75fee20ffbbc8fca931bdded2854cbb0eb9
-#+bison.decdb705b70b77ca41fc5899990d94dac2d501b4a9be5cbb16e5d500e3698b8d
-#+musl-fts.4778c2f5f7f04c2f79f3e190403ec07be19ca1a72c7588b4ec04eed0e5cdc648
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+m4.28318b78ba2f3660a0f3aef5d4e29cad2eb99ea39dabfb21d0452ce6fb5bfcf1
+#+flex.34fe28b384e691fe56db9c24d06b66a1c1cc80ef86538aba64eecc5949cc823a
+#+bison.01d3b98d0b385e5274ca2e31af81d5b06d703373e22d45c7626518771f98c271
+#+musl-fts.494fefa73acf9fa820772c9d403de635597631fad4d27eed9b8229ce4e87cb12
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+zstd.e81207b4cc9c549c91cb86fa138ac828146db92cd4b9121953d814e98dd45430
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+zstd.cf85bfdc564e415c9bb92168c0c87363bbb1d93b08116e1337a3dd1678523052
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+m4.38a87b80b0c591e69af79e6c2802927de15ff689f0adb75f9c7d954f72d0dc78
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+m4.28318b78ba2f3660a0f3aef5d4e29cad2eb99ea39dabfb21d0452ce6fb5bfcf1
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+m4.38a87b80b0c591e69af79e6c2802927de15ff689f0adb75f9c7d954f72d0dc78
-#+ca-certificates-wip-donotuse.0bd442c7f4df35f8b61287c3cd00228e75fae2ad6cf271c0ba10da9be2d71d70
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+m4.28318b78ba2f3660a0f3aef5d4e29cad2eb99ea39dabfb21d0452ce6fb5bfcf1
+#+ca-certificates-wip-donotuse.2c0ed13a2bcca878a2a10001118bc0f9be9b038e8c1e1ba03c461b668dbe84de
 #@sha256:a68fedc0edd976b9f35ecfdcb252d80dc12084b1bc4e945be7dc42c437d8b540:c_rehash.c
 #@untar:-z:sha256:6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954:.
 
@@ -103,7 +101,7 @@ make DESTDIR="$pthbs_destdir" install
 
 cd ..
 gcc ./c_rehash.c -o c_rehash --static -static -I"$pthbs_destdir/$prefix/include" -L"$pthbs_destdir/$prefix/library" -lssl -lcrypto
-cp -vs '/versions/ca-certificates-wip-donotuse.0bd442c7f4df35f8b61287c3cd00228e75fae2ad6cf271c0ba10da9be2d71d70/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/"
+cp -vs '/versions/ca-certificates-wip-donotuse.2c0ed13a2bcca878a2a10001118bc0f9be9b038e8c1e1ba03c461b668dbe84de/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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+m4.38a87b80b0c591e69af79e6c2802927de15ff689f0adb75f9c7d954f72d0dc78
-#+pkgconf-pkg-config.be6ee070c4ac4c7b49e88b8b278433f87977325548cd8dc216b43bcd3583fc2f
-#+gperf.1cefa905b17231bcd50363af1dc724a32f30f462360c0b9aa79c003c4220f1f0
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+m4.28318b78ba2f3660a0f3aef5d4e29cad2eb99ea39dabfb21d0452ce6fb5bfcf1
+#+pkgconf-pkg-config.7ee8c130cacd4c651ebe6108af8aca3c7efd925aab794ada3b68a3525682a5cd
+#+gperf.87e0ddc8814a271b6acaf5a6390e249e01ef46d7da856d40177fa6d6c34b11f5
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+m4.38a87b80b0c591e69af79e6c2802927de15ff689f0adb75f9c7d954f72d0dc78
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+m4.28318b78ba2f3660a0f3aef5d4e29cad2eb99ea39dabfb21d0452ce6fb5bfcf1
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-modutils.ec6b4d037ab46ada4552a159a8080917f77dbcfb4ee129b3a52e2cbe2c8308bf
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+findutils.781947fa469b78ae5279f7676b2bb9e31f710b7f0ff3a1ddea07d587701091c4
-#+diffutils.c6a01fe99dbc69a4244c2bda8041e48cdabd3ad2e6ac218f52d272e9970fe900
-#+patch.4b17ba73415945930feb5a8c33383d1bc664528c5de906279d913a178fc51a34
-#+flex.1d3678d5160eeee569843ad18b19e75fee20ffbbc8fca931bdded2854cbb0eb9
-#+bison.decdb705b70b77ca41fc5899990d94dac2d501b4a9be5cbb16e5d500e3698b8d
-#+rsync.722ce21d65643be0a9c878fd7939ab722426612683234301a5d375bd730f4ecf
-#+zstd.e81207b4cc9c549c91cb86fa138ac828146db92cd4b9121953d814e98dd45430
-#+libelf.b93a9fd7f83e4d70541a06a3315bd6d3623dd031b06d74bda50616ecde735f52
-#+pkgconf-pkg-config.be6ee070c4ac4c7b49e88b8b278433f87977325548cd8dc216b43bcd3583fc2f
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-modutils.35c43d4b68ad79e661e3ddfd6637ac6dafee4b0b0bffc5d3a5ac3a447f32d481
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+findutils.90e39013e744f9b11295b4d009f8a887e4fcc13d378dc99b347611d302377870
+#+diffutils.d572049a256722eee683e5690bbe39272948fa2a357134e6e9d494cf0fdc0938
+#+patch.344b6ea08e2a4014a6ef6279ea19fe8baed234e3d5702f0663b29be408a28a4f
+#+flex.34fe28b384e691fe56db9c24d06b66a1c1cc80ef86538aba64eecc5949cc823a
+#+bison.01d3b98d0b385e5274ca2e31af81d5b06d703373e22d45c7626518771f98c271
+#+rsync.6eb8ec4110251f2382150402df9ea529aa86f82c17e8ee6820255b1c199508b2
+#+zstd.cf85bfdc564e415c9bb92168c0c87363bbb1d93b08116e1337a3dd1678523052
+#+libelf.3eeb623e0c737ec3a614b0b88be841568472d9b75c9e5c4ce13ad2b64515104f
+#+pkgconf-pkg-config.7ee8c130cacd4c651ebe6108af8aca3c7efd925aab794ada3b68a3525682a5cd
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+zsh.c6fa30dd50149febee90db3be2fe3e6bc4a845fc3ac0a9d08eb98dcd42eafffb
-#+pthbs-banginstall.95b17f999d91f4e7d3dd8c9d215fe646456df7d7fa9d5d346f9fe9cfa154c88e
-#+execline.d963c1317b79d4bae96a3445edb8b9cbe87f759e8056d4ab38a9f38679f35309
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+ccx-utils.1b32dd5e4162af2d18026dd192829f8cb000f9e4720e3e8f7249c5b7841836a0
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+zsh.65d601fbc4a749bb977ee7ccbe517020bcbdfe61fd5504b5440421f95da35a77
+#+pthbs-banginstall.3b3f025e00f21ba563b61728501c9c6055204176fbc1342049a9cce5e1f4b914
+#+execline.85cc7c0d2321980cb1e745b91195ac39cc867bcc8a5dbde79ecf983a746fc4e0
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+ccx-utils.21d2a71da5cad3e4247f035a5c27a9b49fba5110aa0402ef6faebc1a085827bb
 #@git:409db79b3e7e5fc6b73305471d9bbb6ac5c14036:logincaps
 
 
diff --git a/variants/root-x86_64/m4 b/variants/root-x86_64/m4
@@ -1,36 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
 #+nawk.f693cc9a360afa00381350243fad82275ec5781c1916597df5ee0072912dea37
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+zsh.c6fa30dd50149febee90db3be2fe3e6bc4a845fc3ac0a9d08eb98dcd42eafffb
-#+pthbs-banginstall.95b17f999d91f4e7d3dd8c9d215fe646456df7d7fa9d5d346f9fe9cfa154c88e
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+zsh.65d601fbc4a749bb977ee7ccbe517020bcbdfe61fd5504b5440421f95da35a77
+#+pthbs-banginstall.3b3f025e00f21ba563b61728501c9c6055204176fbc1342049a9cce5e1f4b914
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+skalibs.01d66a08679c552412188a2d7009c78274a735054bcb4fb048d2596a95e5e822
-#+execline.d963c1317b79d4bae96a3445edb8b9cbe87f759e8056d4ab38a9f38679f35309
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+skalibs.5d72ca2067512220a1dc84af06e0f0bd1d48a95690f718f40b3dec9d502721f6
+#+execline.85cc7c0d2321980cb1e745b91195ac39cc867bcc8a5dbde79ecf983a746fc4e0
 #@git:96aef400b9f9d14f3bf54b0e444e9ad3665c4107:mdevd
 
 
@@ -49,7 +47,7 @@ cd 'mdevd'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.01d66a08679c552412188a2d7009c78274a735054bcb4fb048d2596a95e5e822/sysdeps' \
+	--with-sysdeps='/versions/skalibs.5d72ca2067512220a1dc84af06e0f0bd1d48a95690f718f40b3dec9d502721f6/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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-dosfstools.e7e96a82c639120ce19b4ad0aefac00473ae9f9ece8ec91253f4df819aebc22b
-#+busybox-e2fsprogs.c86d2e956c5b72327914920bb3614c3e3329c7e248070cd9345e91d1b272ce77
-#+busybox-iproute2.536ad1a3df102370378566b14f6620e0549c998d898ddf2acab297d0af3255f0
-#+busybox-iputils.6ca30c7ef168e77615c0711114b6dfdae8744dc7e4468eae90bed8ba55d69486
-#+busybox-net-misc.af3f560d254e759c782a8e40e3ad266b14a3fdda794cfd2d912f1339df3000fb
-#+busybox-net-tools.fde3f542c260f3fd286748bc0b734fd29421285531fa3dae1072403f87637126
-#+busybox-traceroute.0991f711f01e83e4023ca6671800a884027c36c48d36a61bc0105d8531abc803
-#+busybox-wget.c9de635f990672a1b56d40e013e1f5e1521e3f641dfbcaa4d5bb8f209a5da952
-#+busybox-chpst.f06035f49aa6e9d72ff7eeef8b15e9d2b14f463ceb11f6af97fbed8fb3993141
-#+busybox-console.83cc80a1bc0805ae769cec8f96dba7b215d453704281eafdd130af3ac3c24ba5
-#+busybox-getty.a867584bdfea68c20b28aa609d159e3a6cbcd3344dc64ecafc9cb6089c7db2b8
-#+busybox-i2c-tools.753db33037b6861f955fde4e99dadf060020ab8f88f3415d9fe3d6716afc78ff
-#+busybox-linux-extra.45d50567c73529b34de5f1a259b288bb4323a75bc774db337b5298a34e3826bb
-#+busybox-mtd-utils.3c833784c1916515a332f34abd988c937b337e7c79e574103751f6031bd2f576
-#+busybox-shadow.1a7afbd3c1545be4e6300ca1399bbefc90bd294ba6d25e699e8ba18743c3614f
-#+busybox-su.6ba27182e1a0fb5c901818f37cdd3735553e026104756a4bc33b945e5ae7bd47
-#+busybox-util-linux-priv.6ebeef8759613ab60a08f5d18d5da5e4294da086d2cac5ccd4f79bb6b80ccb3c
-#+busybox-logging.e3eba2a127bb0dcd8fd74553766a108ca60711dfbdfec56da3de7ec792b9188e
-#+busybox-cron.15f801c9173b4ccbee5d8ce3095e9c484dafeafc2a468d78ecc677da7f8ce323
-#+execline.d963c1317b79d4bae96a3445edb8b9cbe87f759e8056d4ab38a9f38679f35309
-#+s6.970ebd231d7a4744f8658f1ea1da226a292dca1c602cb875bc48cf6550c41860
-#+mdev-scripts.638b9adf37cbb3894142a83cf17c487ba6b54fb01061b0e834170946ee661f03
-#+mdevd.39046ba66db9e8738fe1a7b78762d40f5cf7e0f615bc8be69ede799349d25449
-#+busybox-modutils.ec6b4d037ab46ada4552a159a8080917f77dbcfb4ee129b3a52e2cbe2c8308bf-
\ No newline at end of file
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-dosfstools.c8a6cc570700401ec04083e03528be62f509b3f012318c8695e53ebd71e2d9dc
+#+busybox-e2fsprogs.d7ad8dfe278a1df7dc09809b12fe5ca3bfc8d5111d072400a0354cc58e1ca4ec
+#+busybox-iproute2.b89ca8cd2e52742249e7333a31781f4ab8d65bc1a6f96f9787232ae0f9b2445a
+#+busybox-iputils.d6673af0836249054af88b34b09d019518441b7c4726ba499e7149bdc67fa170
+#+busybox-net-misc.eb36c8a47d4f5bc64b470efdd7ee2e53fd62ef2f997d5e4adc37fc843457d78c
+#+busybox-net-tools.a99a761cb56648fbba5f32aedbb9083e76c3fbea9a87ed59df2e82ba5465f3e7
+#+busybox-traceroute.366e1b435e86543f56572d0d5bb79ba53a5a92c684cb3cc93cd9de0a4d5edf71
+#+busybox-wget.a6f7d54f195c28d53728a120a7d1b61e91c5dfc23d26c3ee2fb5aa025e3262bf
+#+busybox-chpst.0df8ecd7905843a0e5515601dcd00723e0b55710706d0241ced309307ef84cee
+#+busybox-console.44d9d593c8f62237919a7d4c04d631d70937cfa9fc5d27fcdd3e7fad16c28cfd
+#+busybox-getty.e09ee3b7215bd50845a232cde7138b98dacd9bfa687d4fac780b0bef08be979a
+#+busybox-i2c-tools.866c066986b22c3b541cc45a648eda608b0f94a10428caefd21dc05776b23c47
+#+busybox-linux-extra.6b5d1707044961c16de2f866a53b4c1efcc60c788a60b68e3328f93ef4fd5a33
+#+busybox-mtd-utils.65395d9e1c0f0792a59fb713e3aebdd27e85307eed29d9d397b9132fc7efb053
+#+busybox-shadow.1e3dc117a129fd93449a98009030e17a4350a62b9918ddf1a7358ba821e8357b
+#+busybox-su.4f5db2b6629fd8c4f6e1668e0e6c58962747c882ee8db4031d91f69fcec892f0
+#+busybox-util-linux-priv.3f582b2110ab99dfb8cda92d90fa9f3ff2040db3a906bdc92a40737396a89a85
+#+busybox-logging.3240660bfa6e394cf14579681c9d20e30b7963cef1e6bdf4a8600f9f769a0de4
+#+busybox-cron.f4612b0a1c37b651c0f058da892228522ae2d8a0681dcc991ffaf37cb1cbe044
+#+execline.85cc7c0d2321980cb1e745b91195ac39cc867bcc8a5dbde79ecf983a746fc4e0
+#+s6.9cffebc9a518b26826266f23956e620fc924e84c2881fa730110d2f0137beb78
+#+mdev-scripts.84d5e47db61ef99e4c7f0b89eb2a6643d83b44e0c63fb2d77b9c2ce54457507d
+#+mdevd.6e1fa351cee2ca7ff7df342f571dd632ba6c74c10fac10c7da5dc4b94fc47779
+#+busybox-modutils.35c43d4b68ad79e661e3ddfd6637ac6dafee4b0b0bffc5d3a5ac3a447f32d481+
\ 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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
 #@git:fefc95731f1260810a3551226b73d35f3d6e9d9e:mlog
 
 
diff --git a/variants/root-x86_64/musl-fts b/variants/root-x86_64/musl-fts
@@ -1,36 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
 #+nawk.f693cc9a360afa00381350243fad82275ec5781c1916597df5ee0072912dea37
-#+bison.decdb705b70b77ca41fc5899990d94dac2d501b4a9be5cbb16e5d500e3698b8d
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
+#+bison.01d3b98d0b385e5274ca2e31af81d5b06d703373e22d45c7626518771f98c271
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+m4.38a87b80b0c591e69af79e6c2802927de15ff689f0adb75f9c7d954f72d0dc78
-#+netbsd-curses.62a2c0d96b66c8c8841802f395753eef59963dc149fec0469883e78ff5146a48
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+m4.28318b78ba2f3660a0f3aef5d4e29cad2eb99ea39dabfb21d0452ce6fb5bfcf1
+#+netbsd-curses.30ca64e8ce129346e0cbfe44ce2525b42d27f37c44ad6c8b6a267ad37528a9e3
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+ocaml.2b401c0ac04a1d73e0068b427734ab510e22f27a2c07ebe99a45474c06284861
-#+ocaml-findlib.2bd9354f098edcbb6607ab698af8c2f725943fd9a2fd9aea1eb9d8fcbe3ff996
-#+ocamlbuild.7da4f7371762fa476b7eedc71111b51824adc6ec116682142ff0cd1f6299b360
-#+opam.713c2144605aec2a59bfe725983f323baf4a97a047ddaa43e3e5b5594293a6ea
-#+ocaml-topkg.bf55a68bb7f120bf33bf5a593693185f4d30148d83227d47bae945587afba1c9
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+ocaml.c361713a0e3f409f88c7e2b9d91e57cf2378aa6cfe6f04e76f8f4bfcfd991b1c
+#+ocaml-findlib.d66ec947fd16a48388b0dadc04310d8a229006cca03159110d217ed965af132d
+#+ocamlbuild.2cb30fe03a018080e5c7dbd37db42f03689ae142a4d983999aa753ecbc1b1673
+#+opam.3fa1e9746d9946785404f9afd7da64492c76a23dd1bdb59f98d47c793670aa0f
+#+ocaml-topkg.18977fc26b5aae2beb6299b9e3fe37ff1dfa8d8f8b5e32eb124d4afec9fa589a
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+ocaml.2b401c0ac04a1d73e0068b427734ab510e22f27a2c07ebe99a45474c06284861
-#+dune.ce9e4dc7cec302879d6a82ee8b9f50884790ce2c39a0471a92f50a8e5d3c4c4c
-#+ocaml_intrinsics_kernel.aba12ab993f570a54957084ac8b56f0a36a8e27edd8347e7b3832ffe161999b2
-#+ocaml-sexplib0.4872de1ae0e35b07eb93655b487f22c3d7eae3d0459f93cdb8d2fd291f4e1475
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+ocaml.c361713a0e3f409f88c7e2b9d91e57cf2378aa6cfe6f04e76f8f4bfcfd991b1c
+#+dune.f4fb9958e1beff8eb776af859a105689b4daa2f8861bbebdf43be7ea78af968e
+#+ocaml_intrinsics_kernel.ae68d047510123bc5d7bc3f927f5755f26bb22d638981804b36237be80189e29
+#+ocaml-sexplib0.f8ff21ca3a02c4ce4bab40b6a88e02569648a176db87e95fa084a04b2198fbf7
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+ocaml.2b401c0ac04a1d73e0068b427734ab510e22f27a2c07ebe99a45474c06284861
-#+ocaml-findlib.2bd9354f098edcbb6607ab698af8c2f725943fd9a2fd9aea1eb9d8fcbe3ff996
-#+ocamlbuild.7da4f7371762fa476b7eedc71111b51824adc6ec116682142ff0cd1f6299b360
-#+opam.713c2144605aec2a59bfe725983f323baf4a97a047ddaa43e3e5b5594293a6ea
-#+ocaml-topkg.bf55a68bb7f120bf33bf5a593693185f4d30148d83227d47bae945587afba1c9
-#+ocaml-astring.79847833475ee00f3a077dfb0faf7bf69b0f298df7ae147c5a162de85d29926b
-#+ocaml-fpath.a2ea96db1cbcfe153cca602788cc65e1ffda246c56420bd34eecd1ef9453c67a
-#+ocaml-rresult.0cae4a7e0bce08a7c6676ddefbecdb75a153a955b70613fb27abab09f75ec7cd
-#+ocaml-fmt.e477a30de0d21b1866090271c1598e54ba1a711e47d0dbe35f5b3f0e36c67d5d
-#+ocaml-logs.8dc46d04fad84e8cc46a329530dc98c0156ad8051bf7f59a001ac46b7312ff28
-#+ocaml-mtime.8b1835063244fbcb4079de01d2a28816e6c04ec6cecfd05066ef52ded18f6511
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+ocaml.c361713a0e3f409f88c7e2b9d91e57cf2378aa6cfe6f04e76f8f4bfcfd991b1c
+#+ocaml-findlib.d66ec947fd16a48388b0dadc04310d8a229006cca03159110d217ed965af132d
+#+ocamlbuild.2cb30fe03a018080e5c7dbd37db42f03689ae142a4d983999aa753ecbc1b1673
+#+opam.3fa1e9746d9946785404f9afd7da64492c76a23dd1bdb59f98d47c793670aa0f
+#+ocaml-topkg.18977fc26b5aae2beb6299b9e3fe37ff1dfa8d8f8b5e32eb124d4afec9fa589a
+#+ocaml-astring.00ec948a0073f2efb36f91d7e640a57a9272b4d0e8229f905b3019c32a39414f
+#+ocaml-fpath.bdbc3175457c5ed7c2a8dded4c972bdd0dd717cdf2e19e6ae1d4bb0536ab5731
+#+ocaml-rresult.53c33a804b96f4afbbc82e2d4627e84502eba2eb570861c7582d7ac1246d8515
+#+ocaml-fmt.e63cbf730033190a90d0a920c5b1935ec28b8e0100ffaf81f27f1e9c7ca4a02d
+#+ocaml-logs.4c76df36a8b53910bfb75cbe10cb6552b616c2d50c78959a434b5039e1ab9428
+#+ocaml-mtime.21510fd875b54c5020e13f991c62454d14024d38b4d09f37b93136313fd323a8
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+ocaml.2b401c0ac04a1d73e0068b427734ab510e22f27a2c07ebe99a45474c06284861
-#+ocaml-findlib.2bd9354f098edcbb6607ab698af8c2f725943fd9a2fd9aea1eb9d8fcbe3ff996
-#+ocamlbuild.7da4f7371762fa476b7eedc71111b51824adc6ec116682142ff0cd1f6299b360
-#+opam.713c2144605aec2a59bfe725983f323baf4a97a047ddaa43e3e5b5594293a6ea
-#+ocaml-topkg.bf55a68bb7f120bf33bf5a593693185f4d30148d83227d47bae945587afba1c9
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+ocaml.c361713a0e3f409f88c7e2b9d91e57cf2378aa6cfe6f04e76f8f4bfcfd991b1c
+#+ocaml-findlib.d66ec947fd16a48388b0dadc04310d8a229006cca03159110d217ed965af132d
+#+ocamlbuild.2cb30fe03a018080e5c7dbd37db42f03689ae142a4d983999aa753ecbc1b1673
+#+opam.3fa1e9746d9946785404f9afd7da64492c76a23dd1bdb59f98d47c793670aa0f
+#+ocaml-topkg.18977fc26b5aae2beb6299b9e3fe37ff1dfa8d8f8b5e32eb124d4afec9fa589a
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+ocaml.2b401c0ac04a1d73e0068b427734ab510e22f27a2c07ebe99a45474c06284861
-#+dune.ce9e4dc7cec302879d6a82ee8b9f50884790ce2c39a0471a92f50a8e5d3c4c4c
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+ocaml.c361713a0e3f409f88c7e2b9d91e57cf2378aa6cfe6f04e76f8f4bfcfd991b1c
+#+dune.f4fb9958e1beff8eb776af859a105689b4daa2f8861bbebdf43be7ea78af968e
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+ocaml.2b401c0ac04a1d73e0068b427734ab510e22f27a2c07ebe99a45474c06284861
-#+dune.ce9e4dc7cec302879d6a82ee8b9f50884790ce2c39a0471a92f50a8e5d3c4c4c
-#+ocamlbuild.7da4f7371762fa476b7eedc71111b51824adc6ec116682142ff0cd1f6299b360
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+ocaml.c361713a0e3f409f88c7e2b9d91e57cf2378aa6cfe6f04e76f8f4bfcfd991b1c
+#+dune.f4fb9958e1beff8eb776af859a105689b4daa2f8861bbebdf43be7ea78af968e
+#+ocamlbuild.2cb30fe03a018080e5c7dbd37db42f03689ae142a4d983999aa753ecbc1b1673
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+m4.38a87b80b0c591e69af79e6c2802927de15ff689f0adb75f9c7d954f72d0dc78
-#+netbsd-curses.62a2c0d96b66c8c8841802f395753eef59963dc149fec0469883e78ff5146a48
-#+ocaml.2b401c0ac04a1d73e0068b427734ab510e22f27a2c07ebe99a45474c06284861
-#+ocamlbuild.7da4f7371762fa476b7eedc71111b51824adc6ec116682142ff0cd1f6299b360
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+m4.28318b78ba2f3660a0f3aef5d4e29cad2eb99ea39dabfb21d0452ce6fb5bfcf1
+#+netbsd-curses.30ca64e8ce129346e0cbfe44ce2525b42d27f37c44ad6c8b6a267ad37528a9e3
+#+ocaml.c361713a0e3f409f88c7e2b9d91e57cf2378aa6cfe6f04e76f8f4bfcfd991b1c
+#+ocamlbuild.2cb30fe03a018080e5c7dbd37db42f03689ae142a4d983999aa753ecbc1b1673
 #@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.2b401c0ac04a1d73e0068b427734ab510e22f27a2c07ebe99a45474c06284861"
+stdlib="$pthbs_destdir/versions/ocaml.c361713a0e3f409f88c7e2b9d91e57cf2378aa6cfe6f04e76f8f4bfcfd991b1c"
 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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+ocaml.2b401c0ac04a1d73e0068b427734ab510e22f27a2c07ebe99a45474c06284861
-#+ocaml-findlib.2bd9354f098edcbb6607ab698af8c2f725943fd9a2fd9aea1eb9d8fcbe3ff996
-#+ocamlbuild.7da4f7371762fa476b7eedc71111b51824adc6ec116682142ff0cd1f6299b360
-#+opam.713c2144605aec2a59bfe725983f323baf4a97a047ddaa43e3e5b5594293a6ea
-#+ocaml-topkg.bf55a68bb7f120bf33bf5a593693185f4d30148d83227d47bae945587afba1c9
-#+ocaml-cmdliner.5148ea95701039a9efc6361e680654db64cd93461cac119f19575a8053ccfa4a
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+ocaml.c361713a0e3f409f88c7e2b9d91e57cf2378aa6cfe6f04e76f8f4bfcfd991b1c
+#+ocaml-findlib.d66ec947fd16a48388b0dadc04310d8a229006cca03159110d217ed965af132d
+#+ocamlbuild.2cb30fe03a018080e5c7dbd37db42f03689ae142a4d983999aa753ecbc1b1673
+#+opam.3fa1e9746d9946785404f9afd7da64492c76a23dd1bdb59f98d47c793670aa0f
+#+ocaml-topkg.18977fc26b5aae2beb6299b9e3fe37ff1dfa8d8f8b5e32eb124d4afec9fa589a
+#+ocaml-cmdliner.133256c887d06e94e96eea1de6f5de3870dbb537f5ffede3a09158020713f20b
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+ocaml.2b401c0ac04a1d73e0068b427734ab510e22f27a2c07ebe99a45474c06284861
-#+ocaml-findlib.2bd9354f098edcbb6607ab698af8c2f725943fd9a2fd9aea1eb9d8fcbe3ff996
-#+ocamlbuild.7da4f7371762fa476b7eedc71111b51824adc6ec116682142ff0cd1f6299b360
-#+opam.713c2144605aec2a59bfe725983f323baf4a97a047ddaa43e3e5b5594293a6ea
-#+ocaml-topkg.bf55a68bb7f120bf33bf5a593693185f4d30148d83227d47bae945587afba1c9
-#+ocaml-astring.79847833475ee00f3a077dfb0faf7bf69b0f298df7ae147c5a162de85d29926b
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+ocaml.c361713a0e3f409f88c7e2b9d91e57cf2378aa6cfe6f04e76f8f4bfcfd991b1c
+#+ocaml-findlib.d66ec947fd16a48388b0dadc04310d8a229006cca03159110d217ed965af132d
+#+ocamlbuild.2cb30fe03a018080e5c7dbd37db42f03689ae142a4d983999aa753ecbc1b1673
+#+opam.3fa1e9746d9946785404f9afd7da64492c76a23dd1bdb59f98d47c793670aa0f
+#+ocaml-topkg.18977fc26b5aae2beb6299b9e3fe37ff1dfa8d8f8b5e32eb124d4afec9fa589a
+#+ocaml-astring.00ec948a0073f2efb36f91d7e640a57a9272b4d0e8229f905b3019c32a39414f
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+ocaml.2b401c0ac04a1d73e0068b427734ab510e22f27a2c07ebe99a45474c06284861
-#+ocaml-findlib.2bd9354f098edcbb6607ab698af8c2f725943fd9a2fd9aea1eb9d8fcbe3ff996
-#+ocamlbuild.7da4f7371762fa476b7eedc71111b51824adc6ec116682142ff0cd1f6299b360
-#+opam.713c2144605aec2a59bfe725983f323baf4a97a047ddaa43e3e5b5594293a6ea
-#+ocaml-topkg.bf55a68bb7f120bf33bf5a593693185f4d30148d83227d47bae945587afba1c9
-#+ocaml-mtime.8b1835063244fbcb4079de01d2a28816e6c04ec6cecfd05066ef52ded18f6511
-#+ocaml-cmdliner.5148ea95701039a9efc6361e680654db64cd93461cac119f19575a8053ccfa4a
-#+ocaml-fmt.e477a30de0d21b1866090271c1598e54ba1a711e47d0dbe35f5b3f0e36c67d5d
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+ocaml.c361713a0e3f409f88c7e2b9d91e57cf2378aa6cfe6f04e76f8f4bfcfd991b1c
+#+ocaml-findlib.d66ec947fd16a48388b0dadc04310d8a229006cca03159110d217ed965af132d
+#+ocamlbuild.2cb30fe03a018080e5c7dbd37db42f03689ae142a4d983999aa753ecbc1b1673
+#+opam.3fa1e9746d9946785404f9afd7da64492c76a23dd1bdb59f98d47c793670aa0f
+#+ocaml-topkg.18977fc26b5aae2beb6299b9e3fe37ff1dfa8d8f8b5e32eb124d4afec9fa589a
+#+ocaml-mtime.21510fd875b54c5020e13f991c62454d14024d38b4d09f37b93136313fd323a8
+#+ocaml-cmdliner.133256c887d06e94e96eea1de6f5de3870dbb537f5ffede3a09158020713f20b
+#+ocaml-fmt.e63cbf730033190a90d0a920c5b1935ec28b8e0100ffaf81f27f1e9c7ca4a02d
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+ocaml.2b401c0ac04a1d73e0068b427734ab510e22f27a2c07ebe99a45474c06284861
-#+dune.ce9e4dc7cec302879d6a82ee8b9f50884790ce2c39a0471a92f50a8e5d3c4c4c
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+ocaml.c361713a0e3f409f88c7e2b9d91e57cf2378aa6cfe6f04e76f8f4bfcfd991b1c
+#+dune.f4fb9958e1beff8eb776af859a105689b4daa2f8861bbebdf43be7ea78af968e
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+ocaml.2b401c0ac04a1d73e0068b427734ab510e22f27a2c07ebe99a45474c06284861
-#+ocaml-findlib.2bd9354f098edcbb6607ab698af8c2f725943fd9a2fd9aea1eb9d8fcbe3ff996
-#+ocamlbuild.7da4f7371762fa476b7eedc71111b51824adc6ec116682142ff0cd1f6299b360
-#+opam.713c2144605aec2a59bfe725983f323baf4a97a047ddaa43e3e5b5594293a6ea
-#+ocaml-topkg.bf55a68bb7f120bf33bf5a593693185f4d30148d83227d47bae945587afba1c9
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+ocaml.c361713a0e3f409f88c7e2b9d91e57cf2378aa6cfe6f04e76f8f4bfcfd991b1c
+#+ocaml-findlib.d66ec947fd16a48388b0dadc04310d8a229006cca03159110d217ed965af132d
+#+ocamlbuild.2cb30fe03a018080e5c7dbd37db42f03689ae142a4d983999aa753ecbc1b1673
+#+opam.3fa1e9746d9946785404f9afd7da64492c76a23dd1bdb59f98d47c793670aa0f
+#+ocaml-topkg.18977fc26b5aae2beb6299b9e3fe37ff1dfa8d8f8b5e32eb124d4afec9fa589a
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+ocaml.2b401c0ac04a1d73e0068b427734ab510e22f27a2c07ebe99a45474c06284861
-#+dune.ce9e4dc7cec302879d6a82ee8b9f50884790ce2c39a0471a92f50a8e5d3c4c4c
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+ocaml.c361713a0e3f409f88c7e2b9d91e57cf2378aa6cfe6f04e76f8f4bfcfd991b1c
+#+dune.f4fb9958e1beff8eb776af859a105689b4daa2f8861bbebdf43be7ea78af968e
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+ocaml.2b401c0ac04a1d73e0068b427734ab510e22f27a2c07ebe99a45474c06284861
-#+dune.ce9e4dc7cec302879d6a82ee8b9f50884790ce2c39a0471a92f50a8e5d3c4c4c
-#+ocaml-compiler-libs.498dd27fad6515ac7d6ca397ac5b84500cbd2c552992ab5dd18879d1d77744a3
-#+ocaml-cppo.b58ccae6f02905a9ccb49e842924966032bfb52d453ec4e92a53e79735f60822
-#+ocaml-findlib.2bd9354f098edcbb6607ab698af8c2f725943fd9a2fd9aea1eb9d8fcbe3ff996
-#+ocaml-ppx_derivers.ee1bde70bcda5bf0a67f0fb322a99c5309d825b9aaa603db8bec88de9a699c06
-#+ocaml-ppxlib.be2248bd21b429cbf029e0e9b6fcb0d7537259234afdb920da34eb231b8719c1
-#+ocaml-sexplib0.4872de1ae0e35b07eb93655b487f22c3d7eae3d0459f93cdb8d2fd291f4e1475
-#+ocaml-stdlib-shims.11b2ce748603d69edc18036b32e5bbef5c3222886c1612b512f02e048e54d981
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+ocaml.c361713a0e3f409f88c7e2b9d91e57cf2378aa6cfe6f04e76f8f4bfcfd991b1c
+#+dune.f4fb9958e1beff8eb776af859a105689b4daa2f8861bbebdf43be7ea78af968e
+#+ocaml-compiler-libs.59784c65d4e7ff85ef7effb609fb5f9e324cd96049499887688628004b23e224
+#+ocaml-cppo.f1ed44a0956bd8354e65c922d396feca80ef104d1c16699d75adefac79e5073c
+#+ocaml-findlib.d66ec947fd16a48388b0dadc04310d8a229006cca03159110d217ed965af132d
+#+ocaml-ppx_derivers.627b1cc4b0aba41dc18d856be37f5400ce8b73373fb352fa19868606bf5e0e7e
+#+ocaml-ppxlib.6542281a98cbee8ae91c043afc956289942d92b83efbcd472511b9bc39909244
+#+ocaml-sexplib0.f8ff21ca3a02c4ce4bab40b6a88e02569648a176db87e95fa084a04b2198fbf7
+#+ocaml-stdlib-shims.6e0bd9e73d92cb08d116a54f089455aaff4e626f2bdaba3a66b3bb778f8e7286
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+ocaml.2b401c0ac04a1d73e0068b427734ab510e22f27a2c07ebe99a45474c06284861
-#+dune.ce9e4dc7cec302879d6a82ee8b9f50884790ce2c39a0471a92f50a8e5d3c4c4c
-#+ocaml-compiler-libs.498dd27fad6515ac7d6ca397ac5b84500cbd2c552992ab5dd18879d1d77744a3
-#+ocaml-ppx_derivers.ee1bde70bcda5bf0a67f0fb322a99c5309d825b9aaa603db8bec88de9a699c06
-#+ocaml-sexplib0.4872de1ae0e35b07eb93655b487f22c3d7eae3d0459f93cdb8d2fd291f4e1475
-#+ocaml-stdlib-shims.11b2ce748603d69edc18036b32e5bbef5c3222886c1612b512f02e048e54d981
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+ocaml.c361713a0e3f409f88c7e2b9d91e57cf2378aa6cfe6f04e76f8f4bfcfd991b1c
+#+dune.f4fb9958e1beff8eb776af859a105689b4daa2f8861bbebdf43be7ea78af968e
+#+ocaml-compiler-libs.59784c65d4e7ff85ef7effb609fb5f9e324cd96049499887688628004b23e224
+#+ocaml-ppx_derivers.627b1cc4b0aba41dc18d856be37f5400ce8b73373fb352fa19868606bf5e0e7e
+#+ocaml-sexplib0.f8ff21ca3a02c4ce4bab40b6a88e02569648a176db87e95fa084a04b2198fbf7
+#+ocaml-stdlib-shims.6e0bd9e73d92cb08d116a54f089455aaff4e626f2bdaba3a66b3bb778f8e7286
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+ocaml.2b401c0ac04a1d73e0068b427734ab510e22f27a2c07ebe99a45474c06284861
-#+ocaml-findlib.2bd9354f098edcbb6607ab698af8c2f725943fd9a2fd9aea1eb9d8fcbe3ff996
-#+ocamlbuild.7da4f7371762fa476b7eedc71111b51824adc6ec116682142ff0cd1f6299b360
-#+opam.713c2144605aec2a59bfe725983f323baf4a97a047ddaa43e3e5b5594293a6ea
-#+ocaml-topkg.bf55a68bb7f120bf33bf5a593693185f4d30148d83227d47bae945587afba1c9
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+ocaml.c361713a0e3f409f88c7e2b9d91e57cf2378aa6cfe6f04e76f8f4bfcfd991b1c
+#+ocaml-findlib.d66ec947fd16a48388b0dadc04310d8a229006cca03159110d217ed965af132d
+#+ocamlbuild.2cb30fe03a018080e5c7dbd37db42f03689ae142a4d983999aa753ecbc1b1673
+#+opam.3fa1e9746d9946785404f9afd7da64492c76a23dd1bdb59f98d47c793670aa0f
+#+ocaml-topkg.18977fc26b5aae2beb6299b9e3fe37ff1dfa8d8f8b5e32eb124d4afec9fa589a
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+ocaml.2b401c0ac04a1d73e0068b427734ab510e22f27a2c07ebe99a45474c06284861
-#+dune.ce9e4dc7cec302879d6a82ee8b9f50884790ce2c39a0471a92f50a8e5d3c4c4c
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+ocaml.c361713a0e3f409f88c7e2b9d91e57cf2378aa6cfe6f04e76f8f4bfcfd991b1c
+#+dune.f4fb9958e1beff8eb776af859a105689b4daa2f8861bbebdf43be7ea78af968e
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+ocaml.2b401c0ac04a1d73e0068b427734ab510e22f27a2c07ebe99a45474c06284861
-#+dune.ce9e4dc7cec302879d6a82ee8b9f50884790ce2c39a0471a92f50a8e5d3c4c4c
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+ocaml.c361713a0e3f409f88c7e2b9d91e57cf2378aa6cfe6f04e76f8f4bfcfd991b1c
+#+dune.f4fb9958e1beff8eb776af859a105689b4daa2f8861bbebdf43be7ea78af968e
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+ocaml.2b401c0ac04a1d73e0068b427734ab510e22f27a2c07ebe99a45474c06284861
-#+ocaml-findlib.2bd9354f098edcbb6607ab698af8c2f725943fd9a2fd9aea1eb9d8fcbe3ff996
-#+ocamlbuild.7da4f7371762fa476b7eedc71111b51824adc6ec116682142ff0cd1f6299b360
-#+opam.713c2144605aec2a59bfe725983f323baf4a97a047ddaa43e3e5b5594293a6ea
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+ocaml.c361713a0e3f409f88c7e2b9d91e57cf2378aa6cfe6f04e76f8f4bfcfd991b1c
+#+ocaml-findlib.d66ec947fd16a48388b0dadc04310d8a229006cca03159110d217ed965af132d
+#+ocamlbuild.2cb30fe03a018080e5c7dbd37db42f03689ae142a4d983999aa753ecbc1b1673
+#+opam.3fa1e9746d9946785404f9afd7da64492c76a23dd1bdb59f98d47c793670aa0f
 #@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.2b401c0ac04a1d73e0068b427734ab510e22f27a2c07ebe99a45474c06284861
-#+dune.ce9e4dc7cec302879d6a82ee8b9f50884790ce2c39a0471a92f50a8e5d3c4c4c
-#+ocamlbuild.7da4f7371762fa476b7eedc71111b51824adc6ec116682142ff0cd1f6299b360
-#+ocaml-base.44de9489938f887f549b09fd6f9d7e1c04bb2fbec865e6e47203b176f9e2aad1
-#+opam.713c2144605aec2a59bfe725983f323baf4a97a047ddaa43e3e5b5594293a6ea
-#+ocaml-bos.b026ccfc3b8c1a2db36954ed8a5f1a7fbb07a21fbc67cd0bebb81518a9f13bd5
-#+ocaml-lun.f9f3d04452444906594319f01743f4665bd8811986cb51a72a9adfb9662f8cff
-#+ocaml-ppx_deriving.6ad13af2f50544fee2be727eaec2ac2aec01d425ff7603e41621ba5e6ba63853-
\ No newline at end of file
+#+ocaml.c361713a0e3f409f88c7e2b9d91e57cf2378aa6cfe6f04e76f8f4bfcfd991b1c
+#+dune.f4fb9958e1beff8eb776af859a105689b4daa2f8861bbebdf43be7ea78af968e
+#+ocamlbuild.2cb30fe03a018080e5c7dbd37db42f03689ae142a4d983999aa753ecbc1b1673
+#+ocaml-base.d103afcf87c698f4e3a22ddb81ab1dabb8ee809bd14df882c135378d5acd544c
+#+opam.3fa1e9746d9946785404f9afd7da64492c76a23dd1bdb59f98d47c793670aa0f
+#+ocaml-bos.26fd1b7c296122149499c3b934f27e09e6e4d8203eeccdedf0694824c51ea2e1
+#+ocaml-lun.75edffe53a46bc7d92695a374684c8161a719451303664bcb4e43766345ee3b5
+#+ocaml-ppx_deriving.8a91269e2f64ec263abc72ad78f300c08641a4a2bd78cb1083f5dda1997bb522+
\ 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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+m4.38a87b80b0c591e69af79e6c2802927de15ff689f0adb75f9c7d954f72d0dc78
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+m4.28318b78ba2f3660a0f3aef5d4e29cad2eb99ea39dabfb21d0452ce6fb5bfcf1
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+ocaml.2b401c0ac04a1d73e0068b427734ab510e22f27a2c07ebe99a45474c06284861
-#+dune.ce9e4dc7cec302879d6a82ee8b9f50884790ce2c39a0471a92f50a8e5d3c4c4c
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+ocaml.c361713a0e3f409f88c7e2b9d91e57cf2378aa6cfe6f04e76f8f4bfcfd991b1c
+#+dune.f4fb9958e1beff8eb776af859a105689b4daa2f8861bbebdf43be7ea78af968e
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+m4.38a87b80b0c591e69af79e6c2802927de15ff689f0adb75f9c7d954f72d0dc78
-#+ocaml.2b401c0ac04a1d73e0068b427734ab510e22f27a2c07ebe99a45474c06284861
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+m4.28318b78ba2f3660a0f3aef5d4e29cad2eb99ea39dabfb21d0452ce6fb5bfcf1
+#+ocaml.c361713a0e3f409f88c7e2b9d91e57cf2378aa6cfe6f04e76f8f4bfcfd991b1c
 #@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.2b401c0ac04a1d73e0068b427734ab510e22f27a2c07ebe99a45474c06284861"
+stdlib="$pthbs_destdir/versions/ocaml.c361713a0e3f409f88c7e2b9d91e57cf2378aa6cfe6f04e76f8f4bfcfd991b1c"
 mkdir -p "${stdlib%/*}"
 ln -s "$pthbs_package" "$stdlib"
 
diff --git a/variants/root-x86_64/opam b/variants/root-x86_64/opam
@@ -1,41 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+diffutils.c6a01fe99dbc69a4244c2bda8041e48cdabd3ad2e6ac218f52d272e9970fe900
-#+patch.4b17ba73415945930feb5a8c33383d1bc664528c5de906279d913a178fc51a34
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+getconf.880ce8afd27608539f556afd47410c03779a95960198ed1f3d6cfa1a701e20f5
-#+ocaml.2b401c0ac04a1d73e0068b427734ab510e22f27a2c07ebe99a45474c06284861
-#+dune.ce9e4dc7cec302879d6a82ee8b9f50884790ce2c39a0471a92f50a8e5d3c4c4c
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+diffutils.d572049a256722eee683e5690bbe39272948fa2a357134e6e9d494cf0fdc0938
+#+patch.344b6ea08e2a4014a6ef6279ea19fe8baed234e3d5702f0663b29be408a28a4f
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+getconf.03aaed48a23a68d18df71b1c277a2be8d553bfff473a407021f7c5802a64f3d7
+#+ocaml.c361713a0e3f409f88c7e2b9d91e57cf2378aa6cfe6f04e76f8f4bfcfd991b1c
+#+dune.f4fb9958e1beff8eb776af859a105689b4daa2f8861bbebdf43be7ea78af968e
 #@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.ce9e4dc7cec302879d6a82ee8b9f50884790ce2c39a0471a92f50a8e5d3c4c4c/command/dune' \
+	--with-dune='/versions/dune.f4fb9958e1beff8eb776af859a105689b4daa2f8861bbebdf43be7ea78af968e/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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+m4.38a87b80b0c591e69af79e6c2802927de15ff689f0adb75f9c7d954f72d0dc78
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+m4.28318b78ba2f3660a0f3aef5d4e29cad2eb99ea39dabfb21d0452ce6fb5bfcf1
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+m4.38a87b80b0c591e69af79e6c2802927de15ff689f0adb75f9c7d954f72d0dc78
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+m4.28318b78ba2f3660a0f3aef5d4e29cad2eb99ea39dabfb21d0452ce6fb5bfcf1
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+pkgconf.8a13718a951ad18a27bb9c8c64ba7edd0146736d81f78b4c5eefc5ee4988e750
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+pkgconf.160cc55fbfcaf3904e3c3722fa1945d10c19d636586d5e3cebe46b1e82d3e818
 
 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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+m4.38a87b80b0c591e69af79e6c2802927de15ff689f0adb75f9c7d954f72d0dc78
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+m4.28318b78ba2f3660a0f3aef5d4e29cad2eb99ea39dabfb21d0452ce6fb5bfcf1
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+zsh.c6fa30dd50149febee90db3be2fe3e6bc4a845fc3ac0a9d08eb98dcd42eafffb
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+zsh.65d601fbc4a749bb977ee7ccbe517020bcbdfe61fd5504b5440421f95da35a77
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+m4.38a87b80b0c591e69af79e6c2802927de15ff689f0adb75f9c7d954f72d0dc78
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+popt.134277387f5ebdf15cf93fdd441dfcf64b8a55401748ef74fb36c8e2f9ff1554
-#+libressl.730f7171f4b481fe74648722fd47bd4f1e947f3a69205d218fc6a5d862c9b872
-#+zstd.e81207b4cc9c549c91cb86fa138ac828146db92cd4b9121953d814e98dd45430
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+m4.28318b78ba2f3660a0f3aef5d4e29cad2eb99ea39dabfb21d0452ce6fb5bfcf1
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+popt.a8c2298d0870620862a66242385c66fc9262b8ab4b73d2fb9258543dc1055d25
+#+libressl.f5c0e0ce668f88d594a7c65d466b5e2a04a14d9c1f50171d1c545a284bf5a6c0
+#+zstd.cf85bfdc564e415c9bb92168c0c87363bbb1d93b08116e1337a3dd1678523052
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+skalibs.01d66a08679c552412188a2d7009c78274a735054bcb4fb048d2596a95e5e822
-#+execline.d963c1317b79d4bae96a3445edb8b9cbe87f759e8056d4ab38a9f38679f35309
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+skalibs.5d72ca2067512220a1dc84af06e0f0bd1d48a95690f718f40b3dec9d502721f6
+#+execline.85cc7c0d2321980cb1e745b91195ac39cc867bcc8a5dbde79ecf983a746fc4e0
 #@git:0e02fe0e92b8f9a619fc355babad2c78c009c1f1:s6
 
 
@@ -49,7 +47,7 @@ cd 's6'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.01d66a08679c552412188a2d7009c78274a735054bcb4fb048d2596a95e5e822/sysdeps' \
+	--with-sysdeps='/versions/skalibs.5d72ca2067512220a1dc84af06e0f0bd1d48a95690f718f40b3dec9d502721f6/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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+skalibs.01d66a08679c552412188a2d7009c78274a735054bcb4fb048d2596a95e5e822
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+skalibs.5d72ca2067512220a1dc84af06e0f0bd1d48a95690f718f40b3dec9d502721f6
 #@git:dc80225c0a78346300d100f0bf0182ed338c4b01:s6-dns
 
 
@@ -48,7 +46,7 @@ cd 's6-dns'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.01d66a08679c552412188a2d7009c78274a735054bcb4fb048d2596a95e5e822/sysdeps' \
+	--with-sysdeps='/versions/skalibs.5d72ca2067512220a1dc84af06e0f0bd1d48a95690f718f40b3dec9d502721f6/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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+skalibs.01d66a08679c552412188a2d7009c78274a735054bcb4fb048d2596a95e5e822
-#+execline.d963c1317b79d4bae96a3445edb8b9cbe87f759e8056d4ab38a9f38679f35309
-#+s6.970ebd231d7a4744f8658f1ea1da226a292dca1c602cb875bc48cf6550c41860
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+skalibs.5d72ca2067512220a1dc84af06e0f0bd1d48a95690f718f40b3dec9d502721f6
+#+execline.85cc7c0d2321980cb1e745b91195ac39cc867bcc8a5dbde79ecf983a746fc4e0
+#+s6.9cffebc9a518b26826266f23956e620fc924e84c2881fa730110d2f0137beb78
 #@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.01d66a08679c552412188a2d7009c78274a735054bcb4fb048d2596a95e5e822/sysdeps' \
+	--with-sysdeps='/versions/skalibs.5d72ca2067512220a1dc84af06e0f0bd1d48a95690f718f40b3dec9d502721f6/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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+skalibs.01d66a08679c552412188a2d7009c78274a735054bcb4fb048d2596a95e5e822
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+skalibs.5d72ca2067512220a1dc84af06e0f0bd1d48a95690f718f40b3dec9d502721f6
 #@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.01d66a08679c552412188a2d7009c78274a735054bcb4fb048d2596a95e5e822/sysdeps' \
+	--with-sysdeps='/versions/skalibs.5d72ca2067512220a1dc84af06e0f0bd1d48a95690f718f40b3dec9d502721f6/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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+skalibs.01d66a08679c552412188a2d7009c78274a735054bcb4fb048d2596a95e5e822
-#+execline.d963c1317b79d4bae96a3445edb8b9cbe87f759e8056d4ab38a9f38679f35309
-#+s6.970ebd231d7a4744f8658f1ea1da226a292dca1c602cb875bc48cf6550c41860
-#+s6-dns.f079ac9da714e06831a6d6e92fbefb898f6860ae9cbfa1e1dce465285acac4f3
-#+libressl.730f7171f4b481fe74648722fd47bd4f1e947f3a69205d218fc6a5d862c9b872
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+skalibs.5d72ca2067512220a1dc84af06e0f0bd1d48a95690f718f40b3dec9d502721f6
+#+execline.85cc7c0d2321980cb1e745b91195ac39cc867bcc8a5dbde79ecf983a746fc4e0
+#+s6.9cffebc9a518b26826266f23956e620fc924e84c2881fa730110d2f0137beb78
+#+s6-dns.36413157c2fa7bf0585fb9fabdfdaa48cd6a239b36f060fc6bb314a016bf77b6
+#+libressl.f5c0e0ce668f88d594a7c65d466b5e2a04a14d9c1f50171d1c545a284bf5a6c0
 #@git:12b40106ed1727274cd6af379c4ba0ca7161700b:s6-networking
 
 
@@ -52,7 +50,7 @@ cd 's6-networking'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.01d66a08679c552412188a2d7009c78274a735054bcb4fb048d2596a95e5e822/sysdeps' \
+	--with-sysdeps='/versions/skalibs.5d72ca2067512220a1dc84af06e0f0bd1d48a95690f718f40b3dec9d502721f6/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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+skalibs.01d66a08679c552412188a2d7009c78274a735054bcb4fb048d2596a95e5e822
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+skalibs.5d72ca2067512220a1dc84af06e0f0bd1d48a95690f718f40b3dec9d502721f6
 #@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.01d66a08679c552412188a2d7009c78274a735054bcb4fb048d2596a95e5e822/sysdeps' \
+	--with-sysdeps='/versions/skalibs.5d72ca2067512220a1dc84af06e0f0bd1d48a95690f718f40b3dec9d502721f6/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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+skalibs.01d66a08679c552412188a2d7009c78274a735054bcb4fb048d2596a95e5e822
-#+execline.d963c1317b79d4bae96a3445edb8b9cbe87f759e8056d4ab38a9f38679f35309
-#+s6.970ebd231d7a4744f8658f1ea1da226a292dca1c602cb875bc48cf6550c41860
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+skalibs.5d72ca2067512220a1dc84af06e0f0bd1d48a95690f718f40b3dec9d502721f6
+#+execline.85cc7c0d2321980cb1e745b91195ac39cc867bcc8a5dbde79ecf983a746fc4e0
+#+s6.9cffebc9a518b26826266f23956e620fc924e84c2881fa730110d2f0137beb78
 #@git:a4756f00b3823952580d1fee704675c6f813a248:s6-rc
 
 
@@ -50,7 +48,7 @@ cd 's6-rc'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.01d66a08679c552412188a2d7009c78274a735054bcb4fb048d2596a95e5e822/sysdeps' \
+	--with-sysdeps='/versions/skalibs.5d72ca2067512220a1dc84af06e0f0bd1d48a95690f718f40b3dec9d502721f6/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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+zsh.c6fa30dd50149febee90db3be2fe3e6bc4a845fc3ac0a9d08eb98dcd42eafffb
-#+pthbs-banginstall.95b17f999d91f4e7d3dd8c9d215fe646456df7d7fa9d5d346f9fe9cfa154c88e
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+zsh.65d601fbc4a749bb977ee7ccbe517020bcbdfe61fd5504b5440421f95da35a77
+#+pthbs-banginstall.3b3f025e00f21ba563b61728501c9c6055204176fbc1342049a9cce5e1f4b914
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+attr.bd96d480e70972a5df7c8aeb7764eff6e240f14b3eb1f5c9264518e7bb3676ab
-#+zstd.e81207b4cc9c549c91cb86fa138ac828146db92cd4b9121953d814e98dd45430
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+attr.5ac38c50ab82191bec2123529926d7d17369e4790e7114a14489807b502f801a
+#+zstd.cf85bfdc564e415c9bb92168c0c87363bbb1d93b08116e1337a3dd1678523052
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+m4.38a87b80b0c591e69af79e6c2802927de15ff689f0adb75f9c7d954f72d0dc78
-#+patch.4b17ba73415945930feb5a8c33383d1bc664528c5de906279d913a178fc51a34
-#+libunwind.7f4227e02a03ba65c3e1bf15020f74fc63a7d5b7934f48238a18c07a061db0e9
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+m4.28318b78ba2f3660a0f3aef5d4e29cad2eb99ea39dabfb21d0452ce6fb5bfcf1
+#+patch.344b6ea08e2a4014a6ef6279ea19fe8baed234e3d5702f0663b29be408a28a4f
+#+libunwind.99017f575e567b7954a7c1ba1170ffd0202970765044031c403f6263b4c39697
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-dosfstools.e7e96a82c639120ce19b4ad0aefac00473ae9f9ece8ec91253f4df819aebc22b
-#+busybox-e2fsprogs.c86d2e956c5b72327914920bb3614c3e3329c7e248070cd9345e91d1b272ce77
-#+busybox-iproute2.536ad1a3df102370378566b14f6620e0549c998d898ddf2acab297d0af3255f0
-#+busybox-iputils.6ca30c7ef168e77615c0711114b6dfdae8744dc7e4468eae90bed8ba55d69486
-#+busybox-net-misc.af3f560d254e759c782a8e40e3ad266b14a3fdda794cfd2d912f1339df3000fb
-#+busybox-net-tools.fde3f542c260f3fd286748bc0b734fd29421285531fa3dae1072403f87637126
-#+busybox-traceroute.0991f711f01e83e4023ca6671800a884027c36c48d36a61bc0105d8531abc803
-#+busybox-wget.c9de635f990672a1b56d40e013e1f5e1521e3f641dfbcaa4d5bb8f209a5da952
-#+busybox-chpst.f06035f49aa6e9d72ff7eeef8b15e9d2b14f463ceb11f6af97fbed8fb3993141
-#+busybox-console.83cc80a1bc0805ae769cec8f96dba7b215d453704281eafdd130af3ac3c24ba5
-#+busybox-getty.a867584bdfea68c20b28aa609d159e3a6cbcd3344dc64ecafc9cb6089c7db2b8
-#+busybox-i2c-tools.753db33037b6861f955fde4e99dadf060020ab8f88f3415d9fe3d6716afc78ff
-#+busybox-linux-extra.45d50567c73529b34de5f1a259b288bb4323a75bc774db337b5298a34e3826bb
-#+busybox-mtd-utils.3c833784c1916515a332f34abd988c937b337e7c79e574103751f6031bd2f576
-#+busybox-shadow.1a7afbd3c1545be4e6300ca1399bbefc90bd294ba6d25e699e8ba18743c3614f
-#+busybox-su.6ba27182e1a0fb5c901818f37cdd3735553e026104756a4bc33b945e5ae7bd47
-#+busybox-util-linux-priv.6ebeef8759613ab60a08f5d18d5da5e4294da086d2cac5ccd4f79bb6b80ccb3c
-#+busybox-logging.e3eba2a127bb0dcd8fd74553766a108ca60711dfbdfec56da3de7ec792b9188e
-#+busybox-cron.15f801c9173b4ccbee5d8ce3095e9c484dafeafc2a468d78ecc677da7f8ce323
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+diffutils.c6a01fe99dbc69a4244c2bda8041e48cdabd3ad2e6ac218f52d272e9970fe900
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+aat.048375e3aab6dd9ff288c7b5ddfc694cffae9dc711001c6bd47a72f5ec839dcf
-#+fileset.09f8a20d60de58f915dffcc0cfb62358ae2daf46426755c69ce8d038624db74f
-#+rsync.722ce21d65643be0a9c878fd7939ab722426612683234301a5d375bd730f4ecf
-#+execline.d963c1317b79d4bae96a3445edb8b9cbe87f759e8056d4ab38a9f38679f35309
-#+kbd.f4b3b8b5d13ec493658a8c0674630919e30e8c4d59581702f6bc542c4b6c55f9
-#+mdevd.39046ba66db9e8738fe1a7b78762d40f5cf7e0f615bc8be69ede799349d25449
-#+s6-linux-utils.ea042eba3759068d6e4452431b2685c4f5148deaea92f452981f62b01cb606f8
-#+s6-rc.8082adbebeb3380871bec61abd50d419ca36d080bb9386934ab3fe0f69155abc
-#+s6.970ebd231d7a4744f8658f1ea1da226a292dca1c602cb875bc48cf6550c41860
-#+zsh.c6fa30dd50149febee90db3be2fe3e6bc4a845fc3ac0a9d08eb98dcd42eafffb
-#+libcgroup.f3b4c58bcd1c821dba5b203ce250309180c14f95cd5bb5f728452839266e652c
-#+system-config-scripts.4349d1ddaf2ba8e1816d23fb8a0109988eeae7a38235bf1400fc16381e1ee7e3
-#+logincaps.f4a1c183fe0ae318dc8b27a67bb2becf3bf1524ae754b8abaf00b0486fcf2b80
-#+busybox-modutils.ec6b4d037ab46ada4552a159a8080917f77dbcfb4ee129b3a52e2cbe2c8308bf
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-dosfstools.c8a6cc570700401ec04083e03528be62f509b3f012318c8695e53ebd71e2d9dc
+#+busybox-e2fsprogs.d7ad8dfe278a1df7dc09809b12fe5ca3bfc8d5111d072400a0354cc58e1ca4ec
+#+busybox-iproute2.b89ca8cd2e52742249e7333a31781f4ab8d65bc1a6f96f9787232ae0f9b2445a
+#+busybox-iputils.d6673af0836249054af88b34b09d019518441b7c4726ba499e7149bdc67fa170
+#+busybox-net-misc.eb36c8a47d4f5bc64b470efdd7ee2e53fd62ef2f997d5e4adc37fc843457d78c
+#+busybox-net-tools.a99a761cb56648fbba5f32aedbb9083e76c3fbea9a87ed59df2e82ba5465f3e7
+#+busybox-traceroute.366e1b435e86543f56572d0d5bb79ba53a5a92c684cb3cc93cd9de0a4d5edf71
+#+busybox-wget.a6f7d54f195c28d53728a120a7d1b61e91c5dfc23d26c3ee2fb5aa025e3262bf
+#+busybox-chpst.0df8ecd7905843a0e5515601dcd00723e0b55710706d0241ced309307ef84cee
+#+busybox-console.44d9d593c8f62237919a7d4c04d631d70937cfa9fc5d27fcdd3e7fad16c28cfd
+#+busybox-getty.e09ee3b7215bd50845a232cde7138b98dacd9bfa687d4fac780b0bef08be979a
+#+busybox-i2c-tools.866c066986b22c3b541cc45a648eda608b0f94a10428caefd21dc05776b23c47
+#+busybox-linux-extra.6b5d1707044961c16de2f866a53b4c1efcc60c788a60b68e3328f93ef4fd5a33
+#+busybox-mtd-utils.65395d9e1c0f0792a59fb713e3aebdd27e85307eed29d9d397b9132fc7efb053
+#+busybox-shadow.1e3dc117a129fd93449a98009030e17a4350a62b9918ddf1a7358ba821e8357b
+#+busybox-su.4f5db2b6629fd8c4f6e1668e0e6c58962747c882ee8db4031d91f69fcec892f0
+#+busybox-util-linux-priv.3f582b2110ab99dfb8cda92d90fa9f3ff2040db3a906bdc92a40737396a89a85
+#+busybox-logging.3240660bfa6e394cf14579681c9d20e30b7963cef1e6bdf4a8600f9f769a0de4
+#+busybox-cron.f4612b0a1c37b651c0f058da892228522ae2d8a0681dcc991ffaf37cb1cbe044
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+diffutils.d572049a256722eee683e5690bbe39272948fa2a357134e6e9d494cf0fdc0938
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+aat.126e22923377fe33f93b81849e9450975a67d3c57bcad9401ee14df44f01b801
+#+fileset.edb14d89ed04d2d9832915d0023aaa8c9249619e79ab1bcf359e5942a732b618
+#+rsync.6eb8ec4110251f2382150402df9ea529aa86f82c17e8ee6820255b1c199508b2
+#+execline.85cc7c0d2321980cb1e745b91195ac39cc867bcc8a5dbde79ecf983a746fc4e0
+#+kbd.2cf54dfc219b85a53f94f6bf581655ea24fe760be97c8bb8646f6c987a151263
+#+mdevd.6e1fa351cee2ca7ff7df342f571dd632ba6c74c10fac10c7da5dc4b94fc47779
+#+s6-linux-utils.30bfc0b08e9ad986c9c382565da44c3375c4e879df7d82cd3b60addcecb6242e
+#+s6-rc.b1b1ba4696f3832c6af87ad9f1818d41a2e6b497c2b2eaa16802bdff1594ecc8
+#+s6.9cffebc9a518b26826266f23956e620fc924e84c2881fa730110d2f0137beb78
+#+zsh.65d601fbc4a749bb977ee7ccbe517020bcbdfe61fd5504b5440421f95da35a77
+#+libcgroup.b8a2021e400854f2afd1eae82bf64f49982550a5bab5373201bdad06811355ee
+#+system-config-scripts.53efdc0dcacb8b84bf16a0e375677a3397ab54402e55735f6278dc5a42a1827d
+#+logincaps.425ca5899172da45c85f9d1cd3abdc7abdb1728d3d9bac6391ca4aa0cfe93587
+#+busybox-modutils.35c43d4b68ad79e661e3ddfd6637ac6dafee4b0b0bffc5d3a5ac3a447f32d481
 #@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.c8d203e93d377bf32dcac8af4e773a36e7342ec64da264753b17aea4ae906112' \
-	'pthbs_path_mdevd=/versions/env.b69e9c9906d6980122892452fb594b14554ecd6229a3ebc0b5d764a234ee3c5b' \
+	'pthbs_path_containers=/versions/env.4e670d810b3d3fe54b8f4ba63b38bef816c72cbaa2642c89557b0255506057f2' \
+	'pthbs_path_mdevd=/versions/env.e0bbaf32dbc51d399141b7945cd4ae821d05d8f83c6493877794959710a6bf58' \
 	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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+busybox-dosfstools.e7e96a82c639120ce19b4ad0aefac00473ae9f9ece8ec91253f4df819aebc22b
-#+busybox-e2fsprogs.c86d2e956c5b72327914920bb3614c3e3329c7e248070cd9345e91d1b272ce77
-#+busybox-iproute2.536ad1a3df102370378566b14f6620e0549c998d898ddf2acab297d0af3255f0
-#+busybox-iputils.6ca30c7ef168e77615c0711114b6dfdae8744dc7e4468eae90bed8ba55d69486
-#+busybox-net-misc.af3f560d254e759c782a8e40e3ad266b14a3fdda794cfd2d912f1339df3000fb
-#+busybox-net-tools.fde3f542c260f3fd286748bc0b734fd29421285531fa3dae1072403f87637126
-#+busybox-traceroute.0991f711f01e83e4023ca6671800a884027c36c48d36a61bc0105d8531abc803
-#+busybox-wget.c9de635f990672a1b56d40e013e1f5e1521e3f641dfbcaa4d5bb8f209a5da952
-#+busybox-chpst.f06035f49aa6e9d72ff7eeef8b15e9d2b14f463ceb11f6af97fbed8fb3993141
-#+busybox-console.83cc80a1bc0805ae769cec8f96dba7b215d453704281eafdd130af3ac3c24ba5
-#+busybox-getty.a867584bdfea68c20b28aa609d159e3a6cbcd3344dc64ecafc9cb6089c7db2b8
-#+busybox-i2c-tools.753db33037b6861f955fde4e99dadf060020ab8f88f3415d9fe3d6716afc78ff
-#+busybox-linux-extra.45d50567c73529b34de5f1a259b288bb4323a75bc774db337b5298a34e3826bb
-#+busybox-mtd-utils.3c833784c1916515a332f34abd988c937b337e7c79e574103751f6031bd2f576
-#+busybox-shadow.1a7afbd3c1545be4e6300ca1399bbefc90bd294ba6d25e699e8ba18743c3614f
-#+busybox-su.6ba27182e1a0fb5c901818f37cdd3735553e026104756a4bc33b945e5ae7bd47
-#+busybox-util-linux-priv.6ebeef8759613ab60a08f5d18d5da5e4294da086d2cac5ccd4f79bb6b80ccb3c
-#+busybox-logging.e3eba2a127bb0dcd8fd74553766a108ca60711dfbdfec56da3de7ec792b9188e
-#+busybox-cron.15f801c9173b4ccbee5d8ce3095e9c484dafeafc2a468d78ecc677da7f8ce323
-#+s6.970ebd231d7a4744f8658f1ea1da226a292dca1c602cb875bc48cf6550c41860
-#+s6-rc.8082adbebeb3380871bec61abd50d419ca36d080bb9386934ab3fe0f69155abc
-#+s6-portable-utils.4edab8efd749332207c049c847dc15c5b600c12d45cc84294b1ac6c874d256aa
-#+s6-linux-init.a9ea381b85b7b809eb57591fe3b85a825f73f9963efd785048769a1d8af302d7
-#+execline.d963c1317b79d4bae96a3445edb8b9cbe87f759e8056d4ab38a9f38679f35309
-#+system-config-rc.1292d5ed34b16770c4627b74c75b68de343de76062e8c73cd6632fe6a9cbfc0c
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+busybox-dosfstools.c8a6cc570700401ec04083e03528be62f509b3f012318c8695e53ebd71e2d9dc
+#+busybox-e2fsprogs.d7ad8dfe278a1df7dc09809b12fe5ca3bfc8d5111d072400a0354cc58e1ca4ec
+#+busybox-iproute2.b89ca8cd2e52742249e7333a31781f4ab8d65bc1a6f96f9787232ae0f9b2445a
+#+busybox-iputils.d6673af0836249054af88b34b09d019518441b7c4726ba499e7149bdc67fa170
+#+busybox-net-misc.eb36c8a47d4f5bc64b470efdd7ee2e53fd62ef2f997d5e4adc37fc843457d78c
+#+busybox-net-tools.a99a761cb56648fbba5f32aedbb9083e76c3fbea9a87ed59df2e82ba5465f3e7
+#+busybox-traceroute.366e1b435e86543f56572d0d5bb79ba53a5a92c684cb3cc93cd9de0a4d5edf71
+#+busybox-wget.a6f7d54f195c28d53728a120a7d1b61e91c5dfc23d26c3ee2fb5aa025e3262bf
+#+busybox-chpst.0df8ecd7905843a0e5515601dcd00723e0b55710706d0241ced309307ef84cee
+#+busybox-console.44d9d593c8f62237919a7d4c04d631d70937cfa9fc5d27fcdd3e7fad16c28cfd
+#+busybox-getty.e09ee3b7215bd50845a232cde7138b98dacd9bfa687d4fac780b0bef08be979a
+#+busybox-i2c-tools.866c066986b22c3b541cc45a648eda608b0f94a10428caefd21dc05776b23c47
+#+busybox-linux-extra.6b5d1707044961c16de2f866a53b4c1efcc60c788a60b68e3328f93ef4fd5a33
+#+busybox-mtd-utils.65395d9e1c0f0792a59fb713e3aebdd27e85307eed29d9d397b9132fc7efb053
+#+busybox-shadow.1e3dc117a129fd93449a98009030e17a4350a62b9918ddf1a7358ba821e8357b
+#+busybox-su.4f5db2b6629fd8c4f6e1668e0e6c58962747c882ee8db4031d91f69fcec892f0
+#+busybox-util-linux-priv.3f582b2110ab99dfb8cda92d90fa9f3ff2040db3a906bdc92a40737396a89a85
+#+busybox-logging.3240660bfa6e394cf14579681c9d20e30b7963cef1e6bdf4a8600f9f769a0de4
+#+busybox-cron.f4612b0a1c37b651c0f058da892228522ae2d8a0681dcc991ffaf37cb1cbe044
+#+s6.9cffebc9a518b26826266f23956e620fc924e84c2881fa730110d2f0137beb78
+#+s6-rc.b1b1ba4696f3832c6af87ad9f1818d41a2e6b497c2b2eaa16802bdff1594ecc8
+#+s6-portable-utils.161e16d5d2b341a2d57cdc65efbbec0b612a1308b595c7a9a9767306bbe69df0
+#+s6-linux-init.5412911f6f2e8d2aaee940f5d4317c85950bf8b079e7fdb63ef1b75e25857112
+#+execline.85cc7c0d2321980cb1e745b91195ac39cc867bcc8a5dbde79ecf983a746fc4e0
+#+system-config-rc.c5fb81aa76da3fe78e62d24c0f3da403bd91f8165943dc5a7d221db5f6464216
 
 
 # - build script start -
@@ -76,7 +76,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-s6rcdb=/versions/system-config-rc.1292d5ed34b16770c4627b74c75b68de343de76062e8c73cd6632fe6a9cbfc0c/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.c5fb81aa76da3fe78e62d24c0f3da403bd91f8165943dc5a7d221db5f6464216/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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+s6-rc.8082adbebeb3380871bec61abd50d419ca36d080bb9386934ab3fe0f69155abc
-#+fileset.09f8a20d60de58f915dffcc0cfb62358ae2daf46426755c69ce8d038624db74f
-#+system-config.5ddc84b64ae06eafa41e93de6f54c7c1aa27fc039d81992692b9ba40eb8b557c
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+s6-rc.b1b1ba4696f3832c6af87ad9f1818d41a2e6b497c2b2eaa16802bdff1594ecc8
+#+fileset.edb14d89ed04d2d9832915d0023aaa8c9249619e79ab1bcf359e5942a732b618
+#+system-config.f28c31b9fbc351878943abfa83362d57da9d032d12dace3d0aed874cc964b67d
 
 
 # - build script start -
@@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-src=/versions/system-config.5ddc84b64ae06eafa41e93de6f54c7c1aa27fc039d81992692b9ba40eb8b557c/config/s6-rc-source
+src=/versions/system-config.f28c31b9fbc351878943abfa83362d57da9d032d12dace3d0aed874cc964b67d/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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+zsh.c6fa30dd50149febee90db3be2fe3e6bc4a845fc3ac0a9d08eb98dcd42eafffb
-#+pthbs-banginstall.95b17f999d91f4e7d3dd8c9d215fe646456df7d7fa9d5d346f9fe9cfa154c88e
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+zsh.65d601fbc4a749bb977ee7ccbe517020bcbdfe61fd5504b5440421f95da35a77
+#+pthbs-banginstall.3b3f025e00f21ba563b61728501c9c6055204176fbc1342049a9cce5e1f4b914
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+zsh.c6fa30dd50149febee90db3be2fe3e6bc4a845fc3ac0a9d08eb98dcd42eafffb
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+zsh.65d601fbc4a749bb977ee7ccbe517020bcbdfe61fd5504b5440421f95da35a77
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
 #@untar:-z:sha256:f3ae622c765db4e0d791ea90a9feba39d7f693ef9cb949a797f7ad6b404a2d61:.
 
 
diff --git a/variants/root-x86_64/user-env b/variants/root-x86_64/user-env
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+execline.d963c1317b79d4bae96a3445edb8b9cbe87f759e8056d4ab38a9f38679f35309
-#+pthbs-banginstall.95b17f999d91f4e7d3dd8c9d215fe646456df7d7fa9d5d346f9fe9cfa154c88e
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+execline.85cc7c0d2321980cb1e745b91195ac39cc867bcc8a5dbde79ecf983a746fc4e0
+#+pthbs-banginstall.3b3f025e00f21ba563b61728501c9c6055204176fbc1342049a9cce5e1f4b914
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-dosfstools.e7e96a82c639120ce19b4ad0aefac00473ae9f9ece8ec91253f4df819aebc22b
-#+busybox-e2fsprogs.c86d2e956c5b72327914920bb3614c3e3329c7e248070cd9345e91d1b272ce77
-#+busybox-iproute2.536ad1a3df102370378566b14f6620e0549c998d898ddf2acab297d0af3255f0
-#+busybox-iputils.6ca30c7ef168e77615c0711114b6dfdae8744dc7e4468eae90bed8ba55d69486
-#+busybox-net-misc.af3f560d254e759c782a8e40e3ad266b14a3fdda794cfd2d912f1339df3000fb
-#+busybox-net-tools.fde3f542c260f3fd286748bc0b734fd29421285531fa3dae1072403f87637126
-#+busybox-traceroute.0991f711f01e83e4023ca6671800a884027c36c48d36a61bc0105d8531abc803
-#+busybox-wget.c9de635f990672a1b56d40e013e1f5e1521e3f641dfbcaa4d5bb8f209a5da952
-#+busybox-chpst.f06035f49aa6e9d72ff7eeef8b15e9d2b14f463ceb11f6af97fbed8fb3993141
-#+busybox-console.83cc80a1bc0805ae769cec8f96dba7b215d453704281eafdd130af3ac3c24ba5
-#+busybox-getty.a867584bdfea68c20b28aa609d159e3a6cbcd3344dc64ecafc9cb6089c7db2b8
-#+busybox-i2c-tools.753db33037b6861f955fde4e99dadf060020ab8f88f3415d9fe3d6716afc78ff
-#+busybox-linux-extra.45d50567c73529b34de5f1a259b288bb4323a75bc774db337b5298a34e3826bb
-#+busybox-mtd-utils.3c833784c1916515a332f34abd988c937b337e7c79e574103751f6031bd2f576
-#+busybox-shadow.1a7afbd3c1545be4e6300ca1399bbefc90bd294ba6d25e699e8ba18743c3614f
-#+busybox-su.6ba27182e1a0fb5c901818f37cdd3735553e026104756a4bc33b945e5ae7bd47
-#+busybox-util-linux-priv.6ebeef8759613ab60a08f5d18d5da5e4294da086d2cac5ccd4f79bb6b80ccb3c
-#+busybox-logging.e3eba2a127bb0dcd8fd74553766a108ca60711dfbdfec56da3de7ec792b9188e
-#+busybox-cron.15f801c9173b4ccbee5d8ce3095e9c484dafeafc2a468d78ecc677da7f8ce323
-#+attr.bd96d480e70972a5df7c8aeb7764eff6e240f14b3eb1f5c9264518e7bb3676ab
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+diffutils.c6a01fe99dbc69a4244c2bda8041e48cdabd3ad2e6ac218f52d272e9970fe900
-#+patch.4b17ba73415945930feb5a8c33383d1bc664528c5de906279d913a178fc51a34
-#+flex.1d3678d5160eeee569843ad18b19e75fee20ffbbc8fca931bdded2854cbb0eb9
-#+bison.decdb705b70b77ca41fc5899990d94dac2d501b4a9be5cbb16e5d500e3698b8d
-#+rsync.722ce21d65643be0a9c878fd7939ab722426612683234301a5d375bd730f4ecf
-#+execline.d963c1317b79d4bae96a3445edb8b9cbe87f759e8056d4ab38a9f38679f35309
-#+s6.970ebd231d7a4744f8658f1ea1da226a292dca1c602cb875bc48cf6550c41860
-#+s6-rc.8082adbebeb3380871bec61abd50d419ca36d080bb9386934ab3fe0f69155abc
-#+s6-portable-utils.4edab8efd749332207c049c847dc15c5b600c12d45cc84294b1ac6c874d256aa
-#+s6-linux-utils.ea042eba3759068d6e4452431b2685c4f5148deaea92f452981f62b01cb606f8
-#+s6-linux-init.a9ea381b85b7b809eb57591fe3b85a825f73f9963efd785048769a1d8af302d7
-#+mdevd.39046ba66db9e8738fe1a7b78762d40f5cf7e0f615bc8be69ede799349d25449
-#+s6-dns.f079ac9da714e06831a6d6e92fbefb898f6860ae9cbfa1e1dce465285acac4f3
-#+libressl.730f7171f4b481fe74648722fd47bd4f1e947f3a69205d218fc6a5d862c9b872
-#+s6-networking.985823000d7538d38f3d60f032d13a691e6d37a4991bed1508a27d590280091a
-#+zsh.c6fa30dd50149febee90db3be2fe3e6bc4a845fc3ac0a9d08eb98dcd42eafffb
-#+pthbs-banginstall.95b17f999d91f4e7d3dd8c9d215fe646456df7d7fa9d5d346f9fe9cfa154c88e
-#+aat.048375e3aab6dd9ff288c7b5ddfc694cffae9dc711001c6bd47a72f5ec839dcf
-#+confz.ac17202cbad6ff803a2970796bbe064651194e36256bbc6894dbca79c69b6803
-#+containers.c1d02b082615e15c2feb03d6699d6477efe785a008628b5667cba973bb8caad7
-#+fileset.09f8a20d60de58f915dffcc0cfb62358ae2daf46426755c69ce8d038624db74f
-#+logincaps.f4a1c183fe0ae318dc8b27a67bb2becf3bf1524ae754b8abaf00b0486fcf2b80
-#+snaprep.1dc067aace6718d566411c7001083da280fd4b9da6117d19ae3ac0b3c7be2e8c
-#+curl.bbbd85518f7e275b7d21992adbd1f5f3b1e91edc0d2bd641155076f8bec15d2d
-#+git.e1b3381e4aa84b1e4e3172e5224dd085fb74e7eeec86e0eca02b4aec3e6dfb1e
-#+xbps.6bb74b636979c06c4ad477b0eef8c10952acdbd53a5644a77e529b8f2edbdf03
-#+apk-tools.034f700ee37431d77eb0aa1838442bc71cac87b3e2b377f1906b2e716321af43
-#+getent.007e4cb060a1904aa50daa0ce66587640b4c16f816c7924a861a5e9f9ba11210
-#+getconf.880ce8afd27608539f556afd47410c03779a95960198ed1f3d6cfa1a701e20f5
-#+iconv.1af5ff995e66cb82f12cda4e95a7e2a4f8eb89f29614e1642e472883b8724a44
-#+libcap.122274cf23c4be84b3bc767ad2011b57b9ee56d23213021cb33dc42c17a9a492
-#+applyuidgid-caps.b34de250aeaa0ec73b9c7f9d3101ff422ccd3bc44389aad2a0d49be7fd01babf
-#+ccx-utils.1b32dd5e4162af2d18026dd192829f8cb000f9e4720e3e8f7249c5b7841836a0
-#+user-env.69ee3dda2d58d0e9c409aadd667c17bcb7bfa825546cbb2d1469767899bac27c
-#+strace.675ef51453416134ef952f8b69c2290916fa2f5a3ca9fc3e70bad9720247cd0c
-#+mlog.e8bf126c4163721a0ad3de90da23dc5c41db5e81302c57241f48e9673b02aa5a
-#+findutils.781947fa469b78ae5279f7676b2bb9e31f710b7f0ff3a1ddea07d587701091c4
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+nvi.c497fa20793a65d73bf37d3df203df922a4f3101cdf9c660af43ade66ab97030
-#+squashfs-tools.07241a65396f6e4c73514df867e762e8e38648deff2fa0eaf473eea4afc68665
-#+mandoc.38850a8445bdfa5ca04c4763eafcdadb026038e6323b37798980b64a7727c264
-#+tinyssh.1398faffed1f87b38911a7ce06625a059b691da70629ddbf258ed85bb0daa367-
\ No newline at end of file
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-dosfstools.c8a6cc570700401ec04083e03528be62f509b3f012318c8695e53ebd71e2d9dc
+#+busybox-e2fsprogs.d7ad8dfe278a1df7dc09809b12fe5ca3bfc8d5111d072400a0354cc58e1ca4ec
+#+busybox-iproute2.b89ca8cd2e52742249e7333a31781f4ab8d65bc1a6f96f9787232ae0f9b2445a
+#+busybox-iputils.d6673af0836249054af88b34b09d019518441b7c4726ba499e7149bdc67fa170
+#+busybox-net-misc.eb36c8a47d4f5bc64b470efdd7ee2e53fd62ef2f997d5e4adc37fc843457d78c
+#+busybox-net-tools.a99a761cb56648fbba5f32aedbb9083e76c3fbea9a87ed59df2e82ba5465f3e7
+#+busybox-traceroute.366e1b435e86543f56572d0d5bb79ba53a5a92c684cb3cc93cd9de0a4d5edf71
+#+busybox-wget.a6f7d54f195c28d53728a120a7d1b61e91c5dfc23d26c3ee2fb5aa025e3262bf
+#+busybox-chpst.0df8ecd7905843a0e5515601dcd00723e0b55710706d0241ced309307ef84cee
+#+busybox-console.44d9d593c8f62237919a7d4c04d631d70937cfa9fc5d27fcdd3e7fad16c28cfd
+#+busybox-getty.e09ee3b7215bd50845a232cde7138b98dacd9bfa687d4fac780b0bef08be979a
+#+busybox-i2c-tools.866c066986b22c3b541cc45a648eda608b0f94a10428caefd21dc05776b23c47
+#+busybox-linux-extra.6b5d1707044961c16de2f866a53b4c1efcc60c788a60b68e3328f93ef4fd5a33
+#+busybox-mtd-utils.65395d9e1c0f0792a59fb713e3aebdd27e85307eed29d9d397b9132fc7efb053
+#+busybox-shadow.1e3dc117a129fd93449a98009030e17a4350a62b9918ddf1a7358ba821e8357b
+#+busybox-su.4f5db2b6629fd8c4f6e1668e0e6c58962747c882ee8db4031d91f69fcec892f0
+#+busybox-util-linux-priv.3f582b2110ab99dfb8cda92d90fa9f3ff2040db3a906bdc92a40737396a89a85
+#+busybox-logging.3240660bfa6e394cf14579681c9d20e30b7963cef1e6bdf4a8600f9f769a0de4
+#+busybox-cron.f4612b0a1c37b651c0f058da892228522ae2d8a0681dcc991ffaf37cb1cbe044
+#+attr.5ac38c50ab82191bec2123529926d7d17369e4790e7114a14489807b502f801a
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+diffutils.d572049a256722eee683e5690bbe39272948fa2a357134e6e9d494cf0fdc0938
+#+patch.344b6ea08e2a4014a6ef6279ea19fe8baed234e3d5702f0663b29be408a28a4f
+#+flex.34fe28b384e691fe56db9c24d06b66a1c1cc80ef86538aba64eecc5949cc823a
+#+bison.01d3b98d0b385e5274ca2e31af81d5b06d703373e22d45c7626518771f98c271
+#+rsync.6eb8ec4110251f2382150402df9ea529aa86f82c17e8ee6820255b1c199508b2
+#+execline.85cc7c0d2321980cb1e745b91195ac39cc867bcc8a5dbde79ecf983a746fc4e0
+#+s6.9cffebc9a518b26826266f23956e620fc924e84c2881fa730110d2f0137beb78
+#+s6-rc.b1b1ba4696f3832c6af87ad9f1818d41a2e6b497c2b2eaa16802bdff1594ecc8
+#+s6-portable-utils.161e16d5d2b341a2d57cdc65efbbec0b612a1308b595c7a9a9767306bbe69df0
+#+s6-linux-utils.30bfc0b08e9ad986c9c382565da44c3375c4e879df7d82cd3b60addcecb6242e
+#+s6-linux-init.5412911f6f2e8d2aaee940f5d4317c85950bf8b079e7fdb63ef1b75e25857112
+#+mdevd.6e1fa351cee2ca7ff7df342f571dd632ba6c74c10fac10c7da5dc4b94fc47779
+#+s6-dns.36413157c2fa7bf0585fb9fabdfdaa48cd6a239b36f060fc6bb314a016bf77b6
+#+libressl.f5c0e0ce668f88d594a7c65d466b5e2a04a14d9c1f50171d1c545a284bf5a6c0
+#+s6-networking.bf060085193e7d274c207d7ece2dc1a9fe2a88db1ad521baaa885169f80369a0
+#+zsh.65d601fbc4a749bb977ee7ccbe517020bcbdfe61fd5504b5440421f95da35a77
+#+pthbs-banginstall.3b3f025e00f21ba563b61728501c9c6055204176fbc1342049a9cce5e1f4b914
+#+aat.126e22923377fe33f93b81849e9450975a67d3c57bcad9401ee14df44f01b801
+#+confz.ed578aebf631a3204b1602c5193228d9e1f4706f2a60326cd058468bcaa8e551
+#+containers.d82e02c92525bc3ac2a363701a00369a02197f99415c84f1dfef61131516686e
+#+fileset.edb14d89ed04d2d9832915d0023aaa8c9249619e79ab1bcf359e5942a732b618
+#+logincaps.425ca5899172da45c85f9d1cd3abdc7abdb1728d3d9bac6391ca4aa0cfe93587
+#+snaprep.6ee236a6b194f88b45d2bc263bc000285189e19d42a690621317119c5245c486
+#+curl.d188d8b5e966c8f58df896345a38cd46c5261b88ae838016fd39d96824955fc4
+#+git.398e356788707a30f1eabf725a65625913907f9b564ee23d340ce906d9e53a53
+#+xbps.611e82716cc0bdbe5d354dec7e0673ed15284de366ce0e2644859381f62d1374
+#+apk-tools.f4b9c2e0da859462f1ae72f7085ec35784024220468e1f835f299159cc638f96
+#+getent.daf2a010a0f6c1a43d2ad5afff396e20b99c1cb05663798d924e5e93a253aec8
+#+getconf.03aaed48a23a68d18df71b1c277a2be8d553bfff473a407021f7c5802a64f3d7
+#+iconv.8dfa3309b363c0c01414aaf8e542884902ccd99bfbcbb011c358afb8325eef61
+#+libcap.a9e2cbdb93b6127674b9067f85482cc2e0ac34a58d783e6a8a6f238443957b72
+#+applyuidgid-caps.fe72e7cd6fb25b8d8ebbc750cefe20593f6f8fe6d5c0997bf9a38c2dfb19399d
+#+ccx-utils.21d2a71da5cad3e4247f035a5c27a9b49fba5110aa0402ef6faebc1a085827bb
+#+user-env.a5dd2ecc35c8ce909ad130c7b779f008c0937e7257940e730bd0c30e25f432db
+#+strace.1002ac13393840a0cf1931f9f59310d14eeeb2e90cc3f276c1e1b352dfee57d7
+#+mlog.f9175803da0d477b1fe12dc239920d2bd388eff9ae29d287501bdf921e120774
+#+findutils.90e39013e744f9b11295b4d009f8a887e4fcc13d378dc99b347611d302377870
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+nvi.ad6e31dab2a13b9c547e1fc0181f798143c0adcecef34a3e4ea833e00fd23ea0
+#+squashfs-tools.3d71d4f7b6ec0bea54dc8a493bfd121b007ac9bab1c0b114136917dba31cdacc
+#+mandoc.4c32f4cbe2c4cdc1d0eb68b68dce4cecca0545918aa47f9b5ae2da8c8dd28b29
+#+tinyssh.36c172256072647974113a0ab43b083d7eff47b431ffb9e20bfb2bc6b0333246+
\ 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.d4c42c800df06d1d2ed9630608d90a71311f08e0e0ba528dbfce211dbe16c6c9-
\ No newline at end of file
+#+linux-qemu-guest.ee39c6e1ad4c0168ff3b7c9374ac40da397a5b9cdbd73e13a8c847e4db5746f0+
\ 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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+libarchive.9e35213d10c611432d56d769662b606ec0d55a44061ae5567db7b6c373924195
-#+libressl.730f7171f4b481fe74648722fd47bd4f1e947f3a69205d218fc6a5d862c9b872
-#+pkgconf-pkg-config.be6ee070c4ac4c7b49e88b8b278433f87977325548cd8dc216b43bcd3583fc2f
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+libarchive.33e661a1642618c610c698c51c815005e6376379908570408c11e95acbb9f833
+#+libressl.f5c0e0ce668f88d594a7c65d466b5e2a04a14d9c1f50171d1c545a284bf5a6c0
+#+pkgconf-pkg-config.7ee8c130cacd4c651ebe6108af8aca3c7efd925aab794ada3b68a3525682a5cd
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+m4.38a87b80b0c591e69af79e6c2802927de15ff689f0adb75f9c7d954f72d0dc78
-#+netbsd-curses.62a2c0d96b66c8c8841802f395753eef59963dc149fec0469883e78ff5146a48
-#+libbsd.d4f941997b6d9d43df3db00299cdbc1f299eb1e4d4d8233b64a5ac594d3b0206
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+m4.28318b78ba2f3660a0f3aef5d4e29cad2eb99ea39dabfb21d0452ce6fb5bfcf1
+#+netbsd-curses.30ca64e8ce129346e0cbfe44ce2525b42d27f37c44ad6c8b6a267ad37528a9e3
+#+libbsd.4b6c5b8b3789bcdd4bb315b0cd814ba5f3a06315cb516b163f229455599139f1
 #@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.42ae7184e997469bfbf871385168c4c0c51a9914c45db395f367b2b66e7d9f38
-#+busybox-bzip2.c6dd14eed9296121db12b4bb50a618330d102d74ca7dfdf8ddf239181dbc9163
-#+busybox-gzip.497d29addaf1fe3458c32fe8fcd3546ff481a043682c390fb712e72e77a40321
-#+busybox-lzop.ba17ca74d350354a96ed532c6965746a547fafab7a3249e5acd00b62804106e9
-#+busybox-unzip.ad632f1fb84c8e9eb2fbf1c0d894b241e1aa5c9c415943c482952236f97ae48e
-#+busybox-xz.0a7e338f75fc139286cf7ecda979ded7a03610844a7dde5d66be0fbf85978d2f
-#+busybox-cpio.34623e634d3cfc71412cded95508bba84bd0ab339ed4863668a4e922912ba9be
-#+busybox-dpkg.436df59e4345ff293aca7e7b1a9f1fc93783e1947ee33edb7da1afe207e60eac
-#+busybox-rpm.b532f3623da1223511f334db3d89d49edde8787ce9cdcd96e13cb133969ca50c
-#+busybox-tar.9a8d0e4b2d9c85ca5fc5164c2705dddb0f3f91b9d1088350dab83ae836050ebe
-#+busybox-ed.4130f6bf8e117625e421d56d32a0080cca274633d134670109d938f1b39c181f
-#+busybox-sed.96d1718c26b5f9e889333fa6402632aa4f0ee47b49bdede55e0c0007416c9b65
-#+busybox-vi.778947eda919a54682464459cc5825190442172821516bcbfdf13603e6b86cf5
-#+busybox-xxd.02a293f401eeac65a931c524ddf8a377bd9345caf2cdc151042ee187fe1ccd7f
-#+busybox-process-extra.441d1b6590cc4cefec05c7a8c67f894c6a65c61b3b5aaa63c055649540a15204
-#+busybox-procps.13e5cdab44d90487e39288468af158d0fa994feca0da564faadb0aba08dd524f
-#+busybox-psmisc.9eb5bcd48ff7dd9b9aacfefa72cb3ceb6e4574424a48f062c44084402b77e7bb
-#+busybox-ash.3506185fbbac93c3e9835d2cbcbb51074314ce469fe6fa2fdac7787126d77dd0
-#+busybox-bc.0e1f984f1283e0e564a61907023007e7b935165a09217b386cf0d5f6c01158c4
-#+busybox-coreutils.090b310829cc62a4cd1edd333f420c10b650cb2780858a976ec9762247864541
-#+busybox-coreutils-extra.d4fa95f5d20fef6a6be68a80652f20aefd422f485a1425be865373afda7bdc94
-#+busybox-daemontools.1746d5109ec799fc5e2b5e1d668a0787b2227635cccbb276c122ee155f973c7c
-#+busybox-grep.88722bf5cdae1a044b618394f3a44da3472745f3b05d3ad3c0a02e9abb7314e8
-#+busybox-misc.8b05682ecfb963506c556f6e68e3c770d5734d2f5f54cd29bbd2fb1e17d7473b
-#+busybox-sh.712383f9c52f4a2085b611e0d57aad6f0beb68f875dc448fe8dcfcfdba6025ce
-#+busybox-util-linux-unpriv.59c387f8f336abe03c1faefe9b6f6183c288d642092954a55e8c60a8cf353037
-#+busybox-findutils.1f25f39a7e5933d94bd9a557c2d068c712344235f7ab194eaf8ca25e24be414b
-#+nawk.8b9f0c6c12c7ded96eb6015673a6b4065bd15f8a819b77b9f7d33b40040ec808
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-#+gnu-make.5ca22407810d7aaffbef2f3d1de90bdc628e3993e78c13cf7e44b3ff102cc404
-#+busybox-diffutils.45139e6c4f5f9d6bae806cd787bf0520e3b66ec3977ddefe855aad9a898fe9e6
+#+busybox.bc24518a67e8d79a8424d93c546bf2ab81154823facced74fb9c994b1008b7eb
+#+busybox-bzip2.f44d6187aac269135bce92c0d37bcf496ef9e786203af56ca9931d43dbb35198
+#+busybox-gzip.f6820aeb19eb98bf0df1cb4eb2c9bd055f68efb4fe7c79878e959cadcb49e071
+#+busybox-lzop.60f8167c1cc034e4a63b9caad65dac75bb7b1582ca46bae688539543c1272933
+#+busybox-unzip.56055da2cbc9b497451ed044bfcf761689cce413ef8d990af902ca97c5bb94a6
+#+busybox-xz.ffce52bcb56ea8f44e9c9c213a2da860dde26839fe4bbc35254b62afeae5eab0
+#+busybox-cpio.249259334af44e63047a1c5a6b6840f00c831e24ae9388b5f31c8987d03def78
+#+busybox-dpkg.5757efac07292c79a00bfc1f918e3e5dfe5326f36fc2f6fea2d05c4065c993bb
+#+busybox-rpm.ac9d56d2cccfa3f146b9eb27794813677aefdac73c3855f4f56534be998d63f6
+#+busybox-tar.11688848db61cb717a42a146d62919806982e3190ff033b97f9e24b373117546
+#+busybox-ed.ef6fac645ddcdc7d4847a798d78dad20e62da1493f6238c599504bef5f61128c
+#+busybox-sed.b828b87ed5de9bec3c35e38f83d54d7bc6dd51804a65baeeecf0548272951e01
+#+busybox-vi.064bf75771ca0246e428a92a6dd91b96012bc5b758bf4c166f272126042a2a8f
+#+busybox-xxd.cb7487f4fd34e324592409532755c4141f7cbb9edc672d85b1f38d37d4472248
+#+busybox-process-extra.8224d1fbfed7bc19ddaf8424b243ba0d3e2400640d8af9759a7ac9550737bd81
+#+busybox-procps.1fcea1b95450e4321d262bb40cfb51ab0613190c4b9a3b51d08eaabc52eb888c
+#+busybox-psmisc.7a7e6c8046a1d00cacbd36277f3eab1ce36b3bc666327a8fb7fc487b3ba62ebd
+#+busybox-ash.d7387f577d4de8716c1a1c609119436d9b61dcc682302da5728871537d84c9c0
+#+busybox-bc.e814c4841671c1939ff4b780802da424d158980774c5323e0765afd48a5e40b4
+#+busybox-coreutils.bd6b1307d0d999d1796eb09fdad4df77239ecb1c4db8ab55902bb658317de216
+#+busybox-coreutils-extra.815b9052f4a6020b14a99f95c9bad43b4bd973ea2a6a644eda405349f8c20fab
+#+busybox-daemontools.6b63fea5d971bcedc0cd54ed3b0c0b09771f5b7d6ab5d6a8ec8cbe8158b0bfb1
+#+busybox-grep.5a694ac20b8a2ba861a9646d24d04f97512e4d80f724afff07e5e28c94dc526a
+#+busybox-misc.46ed4c729eb9ce04ee89ee28882fa8e1ae764ba1c1180b539f2ae967e3ea6eca
+#+busybox-sh.1f1a5593b8ef7465ec37fb016cdb791e8161818f4cc27e8f42c1cb9e7ed65583
+#+busybox-util-linux-unpriv.ec96bd86054b1e699e9fc4b99cf8a763e1da21a24887870fc4566604b26ee4d1
+#+busybox-findutils.bc3ff71db6e5525511cc2c01f0ce42993aa251219910c7ca8f7f21d528546743
+#+nawk.c2a8a4dcfff7ad77ebd6ed9d8f20f16e916a2c50e8d5116c588cafc5a7f49bfb
+#+musl-cross-make.4698e3c3bd75b9df32fbbf913df1fbb02d263bc1411ad6af47f1162c755ac1a6
+#+gnu-make.2e87b1858b231579741f7923f2b241512cc7f07ed39484be78e313c4c3dd3703
+#+busybox-diffutils.6f9268b632fefe2b6fb40ed0e3b2002c50c96a19535d0cf8acb10d24c07d057d
 #@untar:-z:sha256:98e9c3d949d1b924e28e01eccb7deed865eefebf25c2f21c702e5cd5b63b85e1:.

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